merged from oauth2 branch
Merge branch 'master' of github.com:wordnik/swagger-ui