added headers to swagger-doc responses to work cleanly with swagger-ui.

Default swagger-ui constantly gives "Can't access server" errors when the "Access-Control-Allow-Origin" is not set.
Merge remote-tracking branch 'upstream/master'