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

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

test/specs/v1.2/petstore/api-docs.json

@@ -53,7 +53,7 @@
     "title": "Swagger Sample App",
     "description": "This is a sample server Petstore server.  You can find out more about Swagger \n    at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample,\n    you can use the api key \"special-key\" to test the authorization filters",
     "termsOfServiceUrl": "http://helloreverb.com/terms/",
-    "contact": "apiteam@wordnik.com",
+    "contact": "apiteam@swagger.io",
     "license": "Apache 2.0",
     "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.html"
   }

test/specs/v2/petstore.json

@@ -8,7 +8,7 @@
     "contact": {
       "url": "http://swagger.io",
       "name": "Your pals at Swagger",
-      "email": "apiteam@wordnik.com"
+      "email": "apiteam@swagger.io"
     },
     "license": {
       "name": "Apache 2.0",