Merge branch 'develop' into oauthTest
refactored the oauth test
Merge branch 'oauthTest' into develop