Merge remote-tracking branch 'origin/issue-1186' into issue-1186

# Conflicts:
#	dist/swagger-ui.js
#	dist/swagger-ui.min.js
#	src/main/javascript/helpers/handlebars.js

src/main/javascript/helpers/handlebars.js

@@ -82,3 +82,10 @@ Handlebars.registerHelper('ifCond', function (v1, operator, v2, options) {
             return options.inverse(this);
     }
 });
+
+Handlebars.registerHelper('if_or', function(v1, v2, options) {
+    if (v1 || v2) {
+        return options.fn(this);
+    }
+    return options.inverse(this);
+});