Merge pull request #112 from patriot1burke/master

oauth clients
Merge remote-tracking branch 'upstream/master'