Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into feature/block-content-type

Conflicts:
	Resources/public/css/main.css
	Resources/public/css/main.min.css
	Resources/public/js/components/content/components/form/main.js
	Resources/public/scss/main.scss
Merge branch 'feature/block-content-type' of git://github.com/sulu-cmf/SuluContentBundle into feature/block-content-type

Conflicts:
	Resources/public/css/main.css
	Resources/public/css/main.min.css
	Resources/public/scss/main.scss
build new version