Update composer
Merge branch 'master' of github.com:hyyan/bedrock

Conflicts:
	composer.lock