mail
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/resources/messages_fr.properties
mail