add email when registering
Merge branch 'master' into production