updated version check, multi support for 2.0
Merge branch 'master' of github.com:wordnik/swagger-ui
Merge branch 'master' of https://github.com/wordnik/swagger-ui

Conflicts:
	dist/lib/swagger-client.js
	lib/swagger-client.js
v2.1.4
- Fixed the "getType" function to support "integer" and "number" without a "format"
- Fixed the "getType" function to default to "object" for types that have schemas