Merge branch 'hotfix/login'
email update
Merge branch 'hotfix/email_update' into develop