Merge pull request #4 from ngodfraind/set-registration-mail-content

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

Conflicts:
	Resources/views/form_theme.html.twig
Merge pull request #5 from ngodfraind/set-registration-mail-content

Set registration mail content
Removed icon absolute location attribute
Merge pull request #318 from stefk/icon-location

Removed icon absolute location attribute
Merge branch 'master' of github.com:claroline/CoreBundle into set-registration-mail-content
Removing method call.
Merge pull request #319 from ngodfraind/bugfix-updater

Removing method call.
Merge branch 'master' of github.com:claroline/CoreBundle into set-registration-mail-content
Content Manager Update + new base content form type
Merge https://github.com/solispauwels/CoreBundle into set-registration-mail-content
Submission for content + new database entry for users for notifications.
Form validation (csfr protection missing)