Content field form type update
Merge branch 'master' of https://github.com/solispauwels/CoreBundle

Conflicts:
	Resources/views/form_theme.html.twig