Manual merge of files from laravel/develop branch
Added to .gitignore: PHPStorm folder, backup & orig files