Merge remote-tracking branch 'upstream/master' into honorApiModelAnnotation

Conflicts:
	swagger-models/src/test/groovy/com/mangofactory/swagger/models/property/bean/BeanModelPropertySpec.groovy
Merge branch 'honorApiModelAnnotation' of https://github.com/fgaule/swagger-springmvc into honorApiModelAnnotation