Merge pull request #168 from guestisp/master

Pull request to sync the code
Merge pull request #169 from guestisp/master

Pull request to sync the code
Oauth updated
Merge branch 'shineisp/sandbox'
Initial support for JWT in OAuth2