fix for #248
Merge branch 'master' of https://github.com/wordnik/swagger-ui

Conflicts:
	dist/swagger-ui.js