Merge remote-tracking branch 'upstream/master'

Conflicts:
	Resources/translations/badge.en.yml
	Resources/translations/badge.fr.yml
	Resources/translations/log.en.yml
	Resources/translations/log.fr.yml
delete file
fix lack of variable error
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