Cleans up the form theming for image Uploads
Merge branch 'master' of git://github.com/undf/ExtraFormBundle

Conflicts:
	Resources/views/Form/angular_fields.html.twig