added mail templates
Merge branch 'master' into dev