merged from master

This commit is contained in:
Tony Tam
2015-12-11 11:16:55 -08:00
6 changed files with 1362 additions and 1329 deletions

2666
dist/swagger-ui.js vendored

File diff suppressed because one or more lines are too long