Merge remote-tracking branch 'swagger/develop_2.0' into JSONEditorMerge

Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/html/index.html
	src/main/template/param.handlebars
	src/main/template/param_required.handlebars

src/main/less/specs.less

@@ -153,6 +153,10 @@
         font-size: 25px;
     }
 
+    .footer {
+        margin-top: 20px;
+    }
+
     p.big, div.big p {
         font-size: 1em;
         margin-bottom: 10px;
@@ -317,6 +321,19 @@
                     }
                 }
             }
+            .propDesc.markdown {
+                > p:first-child,
+                > p:last-child {
+                    display: inline;
+                }
+                > p:not(:first-child):before {
+                    display: block;
+                    content: '';
+                }
+            }
+            span:last-of-type.propDesc.markdown > p:only-child {
+                margin-right: -3px; // otherwise there is a gap before the comma
+            }
         }
         .propName {
             font-weight: bold;
@@ -1089,6 +1106,10 @@
             }
         }
     }
+
+    .operation-status td.markdown > p:last-child {
+        padding-bottom: 0;
+    }
 }
 
 }