email templates
Merge branch 'working'