RSA 2.0 support
Merge branch 'master' into oauth-fix-deps

Conflicts:
	authenticate-oauth/Web/Authenticate/OAuth.hs