oauth changes + github added
Merge branch 'develop'