Added proper formatting for hal+json Content-Type responses
Added proper formatting for hal+json Content-Type responses in coffeescript source file
Respect 'required' attribute in @ApiModelProperty when rendering data models
manual merge of #303
manual merge of #304
fix for #301, headers being URI encoded
fixed merge issue
added resource description
fix for required fields showing optional
fixed example
fix for #310
Merge branch 'master' of github.com:wordnik/swagger-ui
merged pr for https://github.com/wordnik/swagger-js/pull/54
updating docs, change in sample and java required for build
Merge pull request #311 from aerotech/master

updating docs, change in sample and java required for build
Merge pull request #295 from tomrac87/hal_json

Proper formatting for "application/hal+json" Content-Type
Revert "Respect 'required' attribute in @ApiModelProperty when rendering data models"

This reverts commit ee32d8872949fc1bdaf150fe6fbd5834ac9a86a8.
Merge remote-tracking branch 'upstream/master'