Change to the login system, request profile from google
still need to update the db to reflect the changes in the new
model.
Merge branch 'userlogin' into dev
Migrate db to reflect new user model
Merge branch 'JonM' into dev
Merge branch 'dev' into JonM