Merge remote-tracking branch 'SwaggerOfficial/develop_2.0' into JSONEditor

Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	package.json

src/main/template/param_required.handlebars

@@ -5,11 +5,13 @@
 			<input type="file" name='{{name}}'/>
 		{{else}}
 			{{#if default}}
+			    <div class="editor_holder"></div>
 				<textarea class='body-textarea required' placeholder='(required)' name='{{name}}'>{{default}}</textarea>
         <br />
         <div class="parameter-content-type" />
 			{{else}}
 				<textarea class='body-textarea required' placeholder='(required)' name='{{name}}'></textarea>
+				<div class="editor_holder"></div>
 				<br />
 				<div class="parameter-content-type" />
 			{{/if}}