merged from master
merged from master
merged from master
Merge branch 'develop' of github.com:wordnik/swagger-core into develop

Conflicts:
	samples/scala-oauth-authorization-server/src/main/scala/com/wordnik/swagger/sample/resource/PetResource.scala