Merge branch 'master' into research_alpha_client
Updated requirements
No longer using the server
Merge branch 'research_alpha_client' of https://github.com/jvazquez/pyoidc into research_alpha_client

Conflicts:
	alpha/app.py