Merge pull request #203 from sulu-cmf/hotfix/content-settings

Hotfix/content settings
Update composer.json
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into hotfix/localized-template-title

Conflicts:
	composer.json