Merge branch 'master' into develop

Conflicts:
	composer.json
	composer.lock
Merge branch 'develop' of github.com:sulu-cmf/sulu-standard into feature/sitemap