Merge branch 'master' of github.com:claroline/CoreBundle into set-registration-mail-content
Merge branch 'master' of github.com:claroline/CoreBundle into set-registration-mail-content
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)
Messages can be sent by mail.
Alert message on success.
twig files layout & title
Reordering translations.
Merge branch 'master' of github.com:claroline/CoreBundle into set-registration-mail-content

Conflicts:
	Resources/translations/badge.en.yml
	Resources/translations/badge.fr.yml
	Resources/translations/log.en.yml
	Resources/translations/log.fr.yml
Merge branch 'master' of github.com:claroline/CoreBundle into set-registration-mail-content
Merge https://github.com/solispauwels/CoreBundle into set-registration-mail-content
Merge branch 'master' of github.com:claroline/CoreBundle into set-registration-mail-content
LocaleListener overrides the locale.
Merge branch 'set-registration-mail-content' of https://github.com/ngodfraind/CoreBundle

Conflicts:
	Resources/translations/badge.en.yml
	Resources/translations/badge.fr.yml
	Resources/translations/log.en.yml
	Resources/translations/log.fr.yml