Merge pull request swagger-api#3388 from swagger-api/release-prepare

updated versions for release

Merge pull request swagger-api#2515 from swagger-api/release-prepare

release prepare

fixed javadoc plugin

Merge pull request swagger-api#1437 from swagger-api/release-prepare

updated versions for release

updated readme

Merge pull request swagger-api#851 from swagger-api/develop_2.0

merge from develop 2.0 for release

fixed version

Merge pull request swagger-api#451 from swagger-api/develop_2.0

Merged from develop_2.0

Merge pull request swagger-api#438 from swagger-api/develop_2.0

merged to master for patch release

removed cruft