new email copy
Merge branch 'master' of https://github.com/Zidisha/zidisha