Setup oAuth2.. Does not work yet..
Merge remote-tracking branch 'origin/master'