email and user name sign in
Merge branch 'user_name_and_email_sign_in' into staging