WIP
Working on OAuth2 integration
Working on OAuth2 integration
WIP
Merge branch 'branch-2-feature-oauth2' into branch-2

* branch-2-feature-oauth2:
  WIP
  Working on OAuth2 integration
  Working on OAuth2 integration
  WIP