Simon: Email templates put in invite process
Merge branch 'master' of github.com:eicore/eidev