DSA-49: Implement endpoint for linking additional OAuth2 providers
Merge branch 'master' into DSA-49

Conflicts:
	oidc/views.py
DSA-49, small fix
DSA-49, update admin panel to show provider account email
Merge pull request #21 from thehackerati/DSA-49

DSA-49: Implement endpoint for linking additional OAuth2 providers