Merge branch 'JSONEditor' into JSONEditorMaster

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

test/e2e/v2.js

@@ -110,6 +110,18 @@ describe('swagger 2.0 spec tests', function () {
     });
   });
 
+  ['root.id','root.username','root.firstName','root.lastName', 'root.email', 'root.password', 'root.phone', 'root.userStatus']
+  .forEach(function (id) {
+    it('should find a jsoneditor for user post with field: ' + id, function (done) {
+      var locator = webdriver.By.xpath('//*[@id=\'user_createUser\']//*[@data-schemapath=\''+id+'\']');
+      driver
+        .wait(webdriver.until.elementLocated(locator),2000)
+        .then(function() { done(); });
+    });
+  });
+
+  // TODO JSonEditor Tests for POST/PUT
+
   after(function() {
     servers.close();
   });

test/specs/v2/petstore.json

@@ -843,7 +843,7 @@
           "xml": {
             "name": "category"
           },
-          "$ref": "Category"
+          "$ref": "#/definitions/Category"
         },
         "name": {
           "type": "string",
@@ -869,7 +869,7 @@
             "wrapped": true
           },
           "items": {
-            "$ref": "Tag"
+            "$ref": "#/definitions/Tag"
           }
         },
         "status": {