Laravel 4 update
Merge branch 'laravel-update'