Added modal fix to bootstrap and docs

docs/templates/pages/index.mustache

@@ -38,7 +38,6 @@
   </div>
 </div>
 
-<<<<<<< HEAD
 <div class="container">
   <div class="changes">
     <h1>{{_i}}What's different?{{/i}}</h1>
@@ -89,6 +88,7 @@
         <ul>
           <li>Action area for header <code>.header-actions</code></li>
           <li>Action area for tables <code>.table-actions</code></li>
+          <li>Fixed margin for modal forms</li>
         </ul>
       </div>
     </div><!--/row-->

less/jasny/bootstrap.less

@@ -28,3 +28,6 @@
 
 // Components: Nav
 @import "navs-tabbable.less";
+
+// Components: Popovers
+@import "modals.less";