increment version.
fix conflicts.
Merge branch 'master' of github.com:laravel/framework