fix FB
Merge branch 'loginAndSignup' into phase1