More progress on using OAuth 2
Merged origin master into local master