updated composer file
Merge branch 'master' of github.com:studio4s/bedrock

Conflicts:
	composer.json