build new version
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into feature/settings-tab

Conflicts:
	Resources/public/dist/components/content/components/content/main.js
	Resources/public/dist/components/content/components/form/main.js
	Resources/public/dist/components/content/main.js