mails
Merge branch 'master' of https://github.com/PqBenoit/Epya

Conflicts:
	config/database.yml
Merge branch 'master' of https://github.com/PqBenoit/Epya