Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
	bootstrap.css
	docs/assets/js/application.js
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html
	docs/upgrading.html

docs/upgrading.html

@@ -38,7 +38,7 @@
             <li><a href="./base-css.html">Base CSS</a></li>
             <li><a href="./components.html">Components</a></li>
             <li><a href="./javascript.html">Javascript plugins</a></li>
-            <li class="active"><a href="./less.html">Using LESS</a></li>
+            <li><a href="./less.html">Using LESS</a></li>
           </ul>
         </div>
       </div>
@@ -100,6 +100,16 @@
     </ul>
   </li>
 </ul>
+<!--
+  <li>
+    <ul>
+      <li></li>
+    </ul>
+  </li>
+-->
+</ul>
+
+
       <!-- Footer
       ================================================== -->
       <footer class="footer">
@@ -109,5 +119,6 @@
         <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
       </footer>
     </div><!-- /container -->
+
   </body>
 </html>