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/html/index.html

@@ -21,6 +21,7 @@
   <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
   <script src='lib/jsoneditor.min.js' type='text/javascript'></script>
   <script src='lib/marked.js' type='text/javascript'></script>
+  <script src='lib/swagger-oauth.js' type='text/javascript'></script>
 
   <script type="text/javascript">
     $(function () {
@@ -36,13 +37,11 @@
         supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
         onComplete: function(swaggerApi, swaggerUi){
           if(typeof initOAuth == "function") {
-            /*
             initOAuth({
               clientId: "your-client-id",
               realm: "your-realms",
               appName: "your-app-name"
             });
-            */
           }
 
           $('pre code').each(function(i, e) {
@@ -55,8 +54,9 @@
           log("Unable to Load SwaggerUI");
         },
         docExpansion: "none",
-        sorter : "alpha",
-        jsonEditor:true
+        jsonEditor:true,
+        apisSorter: "alpha",
+        showRequestHeaders: false
       });
 
       function addApiKeyAuthorization(){
@@ -74,7 +74,6 @@
       /*
         var apiKey = "myApiKeyXXXX123456789";
         $('#input_apiKey').val(apiKey);
-        addApiKeyAuthorization();
       */
 
       window.swaggerUi.load();