Update composer.json for Laravel 4.2
Merge branch 'master' into laravel-42

Conflicts:
	.gitignore
	composer.json