added support for joda time; support for @ApiProperty
added support for joda time; support for @ApiProperty
changed swagger version to 1.1; added an id property for every model
Merge branch 'master' of https://github.com/dpupaza/swagger-springmvc
fixed dependency conflict