updated email templates
Merge branch 'develop' of https://github.com/hackfaber/hackfaber.com into develop