oauth2orize
Don't need the json endpoint any more
Merge branch 'oauth2orize'