Merge branch 'master' of github.com:pose/swagger-ui

Conflicts:
	lib/swagger.js

src/main/coffeescript/view/OperationView.coffee

@@ -86,7 +86,7 @@ class OperationView extends Backbone.View
         complete: (data) =>
           @showCompleteStatus(data)
 
-      obj.contentType = "application/json" if (obj.type.toLowerCase() == "post" or obj.type.toLowerCase() == "put" or obj.type.toLowerCase() == "patch")
+      obj.contentType = "application/json" if (obj.type.toLowerCase() == "put" or obj.type.toLowerCase() == "patch")
     
       jQuery.ajax(obj)
       false

src/main/coffeescript/view/ParameterView.coffee

@@ -6,6 +6,7 @@ class ParameterView extends Backbone.View
 
     template = @template()
     $(@el).html(template(@model))
+
     @
 
   # Return an appropriate template based on if the parameter is a list, readonly, required