update to laravel 4.2
Merge branch 'feature/laravel-4.2'