upgrade oauth auth mechanism;
Merge branch 'origin/develop'