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

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

src/main/html/index.html

@@ -44,9 +44,12 @@
             });
             */
           }
+
           $('pre code').each(function(i, e) {
             hljs.highlightBlock(e)
           });
+
+          addApiKeyAuthorization();
         },
         onFailure: function(data) {
           log("Unable to Load SwaggerUI");
@@ -56,9 +59,8 @@
         jsonEditor:true
       });
 
-      function addApiKeyAuthorization() {
+      function addApiKeyAuthorization(){
         var key = encodeURIComponent($('#input_apiKey')[0].value);
-        log("key: " + key);
         if(key && key.trim() != "") {
             var apiKeyAuth = new SwaggerClient.ApiKeyAuthorization("api_key", key, "query");
             window.swaggerUi.api.clientAuthorizations.add("api_key", apiKeyAuth);