Added email to member and member's admin
Merge branch 'master' into production