Merge branch 'master' of github.com:laravel/laravel
.idea added to .gitignore file. .idea is the meta data folder, used only by JetBrains PHPStorm editor.
Merge branch 'develop' of https://github.com/martin-rohwedder/laravel into develop