Don't quit SignUpOrLogInActivity
merges
murging Ashleys fix
Merge branch 'ashleyjihye2-master2'
a