User can signup without facebook.
Merge branch 'usersignup'