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

Conflicts:
	.idea/workspace.xml