add send emailing
Merge branch 'feature/sami' into dev

Conflicts:
	.idea/workspace.xml
Merge branch 'feature/rouksana' into dev
fix update equipe