Adds preliminary support for OAuth 2.0
Merge and fix conflicts
Merge branch 'bloudermilk-oauth2'