Initial work for Email Templates
Merge branch 'master' of github.com:brendo/emailtemplate