Merge remote-tracking branch 'upstream/master' into JSONEditorMaster

Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/javascript/view/OperationView.js
	src/main/less/screen.less

src/main/template/content_type.handlebars

@@ -2,7 +2,7 @@
 <select name="contentType" id="{{contentTypeId}}">
 {{#if produces}}
   {{#each produces}}
-	<option value="{{{this}}}">{{{this}}}</option>
+	<option value="{{this}}">{{{this}}}</option>
 	{{/each}}
 {{else}}
   <option value="application/json">application/json</option>

src/main/template/operation.handlebars

@@ -18,10 +18,10 @@
       </div>
       <div class='content' id='{{parentId}}_{{nickname}}_content' style='display:none'>
         {{#if deprecated}}
-            <h4>Warning: Deprecated</h4>
+            <h4><span data-sw-translate>Warning: Deprecated</span></h4>
         {{/if}}
         {{#if description}}
-        <h4>Implementation Notes</h4>
+        <h4><span data-sw-translate>Implementation Notes</span></h4>
         <div class="markdown">{{{description}}}</div>
         {{/if}}
         {{#oauth}}
@@ -42,9 +42,11 @@
         {{/oauth}}
         {{#if type}}
           <h4><span data-sw-translate>Response Class</span> (<span data-sw-translate>Status</span> {{successCode}})</h4>
+            {{#if successDescription}}<div class="markdown">{{{successDescription}}}</div>{{/if}}
           <p><span class="model-signature" /></p>
           <br/>
           <div class="response-content-type" />
+
         {{/if}}
         <form accept-charset='UTF-8' class='sandbox'>
           <div style='margin:0;padding:0;display:inline'></div>
@@ -78,7 +80,6 @@
             </tr>
             </thead>
             <tbody class="operation-status">
-
             </tbody>
           </table>
           {{/if}}

src/main/template/param_readonly.handlebars

@@ -2,6 +2,7 @@
 <td>
     {{#if isBody}}
         <textarea class='body-textarea' readonly='readonly' name='{{name}}' id='{{valueId}}'>{{default}}</textarea>
+        <div class="parameter-content-type" />
     {{else}}
         {{#if default}}
             {{default}}

src/main/template/parameter_content_type.handlebars

@@ -2,7 +2,7 @@
 <select name="parameterContentType" id="{{parameterContentTypeId}}">
 {{#if consumes}}
   {{#each consumes}}
-  <option value="{{{this}}}">{{{this}}}</option>
+  <option value="{{this}}">{{{this}}}</option>
   {{/each}}
 {{else}}
   <option value="application/json">application/json</option>

src/main/template/response_content_type.handlebars

@@ -2,7 +2,7 @@
 <select name="responseContentType" id="{{responseContentTypeId}}">
 {{#if produces}}
   {{#each produces}}
-  <option value="{{{this}}}">{{{this}}}</option>
+  <option value="{{this}}">{{{this}}}</option>
   {{/each}}
 {{else}}
   <option value="application/json">application/json</option>