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

Conflicts:
	composer.lock
updated configs due to changes
updated composer and config
Merge branch 'bugfix/admin-url' into develop
Merge branch 'develop' of github.com:sulu-cmf/sulu-standard into develop

Conflicts:
	app/website/config/config.yml