Update to Laravel 4.2
Merge branch 'laravel-4.2'

* laravel-4.2:
  Update to Laravel 4.2

Conflicts:
	app/config/app.php