Merge branch 'hotfix/seo'
updated composer
fixed template loading with empty block group

Conflicts:
	Resources/public/dist/validation/types/block.js
Merge branch 'master' of git://github.com/sulu-cmf/SuluContentBundle into hotfix/empty-block

Conflicts:
	Resources/public/dist/validation/types/block.js
Merge branch 'hotfix/empty-block' into develop

Conflicts:
	composer.json