Upgrade from Laravel 4.0 to 4.1
Merge branch 'laravel-upgrade'