Commit 3/11
Conflict mailform-fr resolved

Conflicts:
	_includes/mail-fr.html