issue #33: added to settings additional social auth permission user:email
Merge remote-tracking branch 'remotes/upstream/master' into issue-33-github-login
Merge branch 'master' into issue-33-github-login