Added email to template
Merge branch 'master' into production