Add oAuth
Merge branch 'master' into feature/devise