email template sql
Merge branch 'working'