Feature/php7 migration#2

maschmann wants to merge 2 commits intomasterphpflo/phpflo-component:masterfrom

feature/php7_migrationphpflo/phpflo-component:feature/php7_migrationCopy head branch name to clipboard