explicitly upgrading swagger-annotations to take advantage of @ApiModelProperty
Merge remote-tracking branch 'origin/master'