add email to scope when calling .login
Merge branch 'dev' into ask_for_email_on_fb_authentication
ask for email when authenticating user
resolve merge conflicts