Merge pull request #1 from djmaze/master

merge upstream
fixed GitHub OAuth login email bug
Merge pull request #3 from Backenkoehler/master

fix OAuth email signup