Updated template
Merge branch 'hotfix/email-template'