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

Conflicts:
	docs/templates/pages/index.mustache

diff --cc docs/index.html
Simple merge

diff --cc docs/templates/pages/index.mustache
index 8cf9261236ec84093851d140ab569b0b2f7b7a2c,7616de4f1152a8c0c93e979e4790612b79c36565..030a693a8a7241755d84b39a180e7b1f1725bd1a
--- 1/docs/templates/pages/index.mustache
--- 2/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@@ -14,13 -14,13 +14,13 @@@
              <div class="benefits">
                <h4>{{_i}}Feature highlights{{/i}}</h4>
                <ul>
-                 <li><span>&times;</span> {{_i}}Built on LESS{{/i}}</li>
-                 <li><span>&times;</span> {{_i}}Complete styleguide docs{{/i}}</li>
-                 <li><span>&times;</span> {{_i}}Fully responsive design{{/i}}</li>
-                 <li><span>&times;</span> {{_i}}Small footprint (7kb gzipped){{/i}}</li>
-                 <li><span>&times;</span> {{_i}}Support for IE7 and up{{/i}}</li>
-                 <li><span>&times;</span> {{_i}}Custom jQuery plugins{{/i}}</li>
-                 <li><span>&times;</span> {{_i}}Dozens of components{{/i}}</li>
 -                <li>{{_i}}<span>&#10004;</span> Built on LESS{{/i}}</li>
 -                <li>{{_i}}<span>&#10004;</span> Complete style guide docs{{/i}}</li>
 -                <li>{{_i}}<span>&#10004;</span> Fully responsive design{{/i}}</li>
 -                <li>{{_i}}<span>&#10004;</span> Small footprint (10kb gzipped){{/i}}</li>
 -                <li>{{_i}}<span>&#10004;</span> Support for IE7 and up{{/i}}</li>
 -                <li>{{_i}}<span>&#10004;</span> Custom jQuery plugins{{/i}}</li>
 -                <li>{{_i}}<span>&#10004;</span> Dozens of components{{/i}}</li>
++                <li><span>&#10004;</span> {{_i}}Built on LESS{{/i}}</li>
++                <li><span>&#10004;</span> {{_i}}Complete styleguide docs{{/i}}</li>
++                <li><span>&#10004;</span> {{_i}}Fully responsive design{{/i}}</li>
++                <li><span>&#10004;</span> {{_i}}Small footprint (7kb gzipped){{/i}}</li>
++                <li><span>&#10004;</span> {{_i}}Support for IE7 and up{{/i}}</li>
++                <li><span>&#10004;</span> {{_i}}Custom jQuery plugins{{/i}}</li>
++                <li><span>&#10004;</span> {{_i}}Dozens of components{{/i}}</li>
                </ul>
              </div>
            </div>