fix FB
Merge branch 'loginAndSignup' into phase1
Merge branch 'phase1' into gh-pages