Merge pull request #17 from laravel-france/develop

merge develop
Merge pull request #18 from laravel-france/master

Merge pull request #17 from laravel-france/develop