New attempt
Merge branch 'master' of https://github.com/villafinder/email-template