Merge branch '3.0.0-wip' into bs3_homepage

Conflicts:
	customize.html
	examples/justified-nav/justified-nav.css

_includes/footer.html

@@ -13,6 +13,7 @@
 <script src="{{ page.base_url }}assets/js/less.js"></script>
 <script src="{{ page.base_url }}assets/js/jszip.js"></script>
 <script src="{{ page.base_url }}assets/js/uglify.js"></script>
+<script src="{{ page.base_url }}assets/js/filesaver.js"></script>
 <script src="{{ page.base_url }}assets/js/customizer.js"></script>
 {% endif %}
 

_includes/nav-components.html

@@ -1,3 +1,11 @@
+<li>
+  <a href="#glyphicons">Glyphicons</a>
+  <ul class="nav">
+    <li><a href="#glyphicons-glyphs">Available glyphs</a></li>
+    <li><a href="#glyphicons-how-to-use">How to use</a></li>
+    <li><a href="#glyphicons-examples">Examples</a></li>
+  </ul>
+</li>
 <li>
   <a href="#dropdowns">Dropdowns</a>
   <ul class="nav">

_includes/nav-css.html

@@ -9,9 +9,6 @@
     <li><a href="#overview-container">Containers</a></li>
   </ul>
 </li>
-<li>
-  <a href="#glyphicons">Glyphicons</a>
-</li>
 <li>
   <a href="#grid">Grid system</a>
   <ul class="nav">

_includes/nav-getting-started.html

@@ -18,6 +18,15 @@
 <li>
   <a href="#disable-responsive">Disabling responsiveness</a>
 </li>
+<li>
+  <a href="#migration">Migrating from 2.x to 3.0</a>
+  <ul class="nav">
+    <li><a href="#migration-classes">Major class changes</a></li>
+    <li><a href="#migration-new">What's new</a></li>
+    <li><a href="#migration-dropped">What's removed</a></li>
+    <li><a href="#migration-notes">Additional notes</a></li>
+  </ul>
+</li>
 <li>
   <a href="#browsers">Browser support</a>
 </li>