updated composer
Merge branch 'master' of github.com:sulu-cmf/sulu-standard into develop

Conflicts:
	composer.lock
updated dependencies