Oauth

Merge oauth code with master