Merge branch 'develop_2.0' into JSONEditor

Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/coffeescript/view/MainView.coffee
	src/main/coffeescript/view/OperationView.coffee
	src/main/coffeescript/view/ParameterView.coffee
	src/main/coffeescript/view/ResourceView.coffee
	src/main/coffeescript/view/SignatureView.coffee
	src/main/html/index.html

src/main/template/main.handlebars

@@ -2,6 +2,11 @@
   {{#if info}}
   <div class="info_title">{{info.title}}</div>
   <div class="info_description markdown">{{{info.description}}}</div>
+  {{#if externalDocs}}
+  <h5>More documentations</h5>
+  <p>{{externalDocs.description}}</p>
+  <a href="{{externalDocs.url}}" target="_blank">{{externalDocs.url}}</a>
+  {{/if}}
   {{#if info.termsOfServiceUrl}}<div class="info_tos"><a href="{{info.termsOfServiceUrl}}">Terms of service</a></div>{{/if}}
   {{#if info.contact.name}}<div class='info_name'>Created by {{info.contact.name}}</div>{{/if}}
   {{#if info.contact.url}}<div class='info_url'>See more at <a href="{{info.contact.url}}">{{info.contact.url}}</a></div>{{/if}}

src/main/template/operation.handlebars

@@ -4,15 +4,15 @@
       <div class='heading'>
         <h3>
           <span class='http_method'>
-          <a href='#!/{{parentId}}/{{nickname}}' class="toggleOperation">{{method}}</a>
+          <a href='#!/{{encodedParentId}}/{{nickname}}' class="toggleOperation">{{method}}</a>
           </span>
           <span class='path'>
-          <a href='#!/{{parentId}}/{{nickname}}' class="toggleOperation {{#if deprecated}}deprecated{{/if}}">{{path}}</a>
+          <a href='#!/{{encodedParentId}}/{{nickname}}' class="toggleOperation {{#if deprecated}}deprecated{{/if}}">{{path}}</a>
           </span>
         </h3>
         <ul class='options'>
           <li>
-          <a href='#!/{{parentId}}/{{nickname}}' class="toggleOperation">{{{summary}}}</a>
+          <a href='#!/{{encodedParentId}}/{{nickname}}' class="toggleOperation">{{{summary}}}</a>
           </li>
         </ul>
       </div>
@@ -22,7 +22,7 @@
         {{/if}}
         {{#if description}}
         <h4>Implementation Notes</h4>
-        <p class="markdown">{{{description}}}</p>
+        <div class="markdown">{{{description}}}</div>
         {{/if}}
         {{#oauth}}
         <div class="auth">
@@ -74,10 +74,11 @@
               <th>HTTP Status Code</th>
               <th>Reason</th>
               <th>Response Model</th>
+              <th>Headers</th>
             </tr>
             </thead>
             <tbody class="operation-status">
-            
+
             </tbody>
           </table>
           {{/if}}

src/main/template/resource.handlebars

@@ -16,9 +16,11 @@
         Expand Operations
       </a>
     </li>
-    {{#url}}<li>
+    {{#if url}}
+    <li>
       <a href='{{url}}'>Raw</a>
-    </li>{{/url}}
+    </li>
+    {{/if}}
   </ul>
 </div>
 <ul class='endpoints' id='{{id}}_endpoint_list' style='display:none'>

src/main/template/status_code.handlebars

@@ -1,3 +1,16 @@
 <td width='15%' class='code'>{{code}}</td>
 <td>{{{message}}}</td>
-<td width='50%'><span class="model-signature" /></td>
+<td width='50%'><span class="model-signature" /></td>
+<td class="headers">
+  <table>
+    <tbody>
+      {{#each headers}}
+      <tr>
+        <td>{{@key}}</td>
+        <td>{{this.description}}</td>
+        <td>{{this.type}}</td>
+      </tr>
+      {{/each}}
+    </tbody>
+  </table>
+</td>