diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 0ce1a29eb6..8f36dc1bb0 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 90f63b6226..4fa386dac0 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -210,6 +210,42 @@
   .span12 {
     width: 724px;
   }
+  .span13 {
+    width: 786px;
+  }
+  .span14 {
+    width: 848px;
+  }
+  .span15 {
+    width: 910px;
+  }
+  .span16 {
+    width: 972px;
+  }
+  .span17 {
+    width: 1034px;
+  }
+  .span18 {
+    width: 1096px;
+  }
+  .span19 {
+    width: 1158px;
+  }
+  .span20 {
+    width: 1220px;
+  }
+  .span21 {
+    width: 1282px;
+  }
+  .span22 {
+    width: 1344px;
+  }
+  .span23 {
+    width: 1406px;
+  }
+  .span24 {
+    width: 1468px;
+  }
   .container {
     width: 724px;
   }
@@ -246,6 +282,42 @@
   .offset11 {
     margin-left: 702px;
   }
+  .offset12 {
+    margin-left: 764px;
+  }
+  .offset13 {
+    margin-left: 826px;
+  }
+  .offset14 {
+    margin-left: 888px;
+  }
+  .offset15 {
+    margin-left: 950px;
+  }
+  .offset16 {
+    margin-left: 1012px;
+  }
+  .offset17 {
+    margin-left: 1074px;
+  }
+  .offset18 {
+    margin-left: 1136px;
+  }
+  .offset19 {
+    margin-left: 1198px;
+  }
+  .offset20 {
+    margin-left: 1260px;
+  }
+  .offset21 {
+    margin-left: 1322px;
+  }
+  .offset22 {
+    margin-left: 1384px;
+  }
+  .offset23 {
+    margin-left: 1446px;
+  }
   .row-fluid {
     width: 100%;
     *zoom: 1;
@@ -300,6 +372,42 @@
   .row-fluid > .span12 {
     width: 99.999999993%;
   }
+  .row-fluid > .span13 {
+    width: 108.563535904%;
+  }
+  .row-fluid > .span14 {
+    width: 117.12707181500001%;
+  }
+  .row-fluid > .span15 {
+    width: 125.690607726%;
+  }
+  .row-fluid > .span16 {
+    width: 134.254143637%;
+  }
+  .row-fluid > .span17 {
+    width: 142.817679548%;
+  }
+  .row-fluid > .span18 {
+    width: 151.381215459%;
+  }
+  .row-fluid > .span19 {
+    width: 159.94475137%;
+  }
+  .row-fluid > .span20 {
+    width: 168.508287281%;
+  }
+  .row-fluid > .span21 {
+    width: 177.071823192%;
+  }
+  .row-fluid > .span22 {
+    width: 185.635359103%;
+  }
+  .row-fluid > .span23 {
+    width: 194.19889501400002%;
+  }
+  .row-fluid > .span24 {
+    width: 202.762430925%;
+  }
   input.span1, textarea.span1, .uneditable-input.span1 {
     width: 32px;
   }
@@ -336,6 +444,42 @@
   input.span12, textarea.span12, .uneditable-input.span12 {
     width: 714px;
   }
+  input.span13, textarea.span13, .uneditable-input.span13 {
+    width: 776px;
+  }
+  input.span14, textarea.span14, .uneditable-input.span14 {
+    width: 838px;
+  }
+  input.span15, textarea.span15, .uneditable-input.span15 {
+    width: 900px;
+  }
+  input.span16, textarea.span16, .uneditable-input.span16 {
+    width: 962px;
+  }
+  input.span17, textarea.span17, .uneditable-input.span17 {
+    width: 1024px;
+  }
+  input.span18, textarea.span18, .uneditable-input.span18 {
+    width: 1086px;
+  }
+  input.span19, textarea.span19, .uneditable-input.span19 {
+    width: 1148px;
+  }
+  input.span20, textarea.span20, .uneditable-input.span20 {
+    width: 1210px;
+  }
+  input.span21, textarea.span21, .uneditable-input.span21 {
+    width: 1272px;
+  }
+  input.span22, textarea.span22, .uneditable-input.span22 {
+    width: 1334px;
+  }
+  input.span23, textarea.span23, .uneditable-input.span23 {
+    width: 1396px;
+  }
+  input.span24, textarea.span24, .uneditable-input.span24 {
+    width: 1458px;
+  }
 }
 @media (max-width: 979px) {
   body {
@@ -499,6 +643,42 @@
   .span12 {
     width: 1170px;
   }
+  .span13 {
+    width: 1270px;
+  }
+  .span14 {
+    width: 1370px;
+  }
+  .span15 {
+    width: 1470px;
+  }
+  .span16 {
+    width: 1570px;
+  }
+  .span17 {
+    width: 1670px;
+  }
+  .span18 {
+    width: 1770px;
+  }
+  .span19 {
+    width: 1870px;
+  }
+  .span20 {
+    width: 1970px;
+  }
+  .span21 {
+    width: 2070px;
+  }
+  .span22 {
+    width: 2170px;
+  }
+  .span23 {
+    width: 2270px;
+  }
+  .span24 {
+    width: 2370px;
+  }
   .container {
     width: 1170px;
   }
@@ -535,6 +715,42 @@
   .offset11 {
     margin-left: 1130px;
   }
+  .offset12 {
+    margin-left: 1230px;
+  }
+  .offset13 {
+    margin-left: 1330px;
+  }
+  .offset14 {
+    margin-left: 1430px;
+  }
+  .offset15 {
+    margin-left: 1530px;
+  }
+  .offset16 {
+    margin-left: 1630px;
+  }
+  .offset17 {
+    margin-left: 1730px;
+  }
+  .offset18 {
+    margin-left: 1830px;
+  }
+  .offset19 {
+    margin-left: 1930px;
+  }
+  .offset20 {
+    margin-left: 2030px;
+  }
+  .offset21 {
+    margin-left: 2130px;
+  }
+  .offset22 {
+    margin-left: 2230px;
+  }
+  .offset23 {
+    margin-left: 2330px;
+  }
   .row-fluid {
     width: 100%;
     *zoom: 1;
@@ -589,6 +805,42 @@
   .row-fluid > .span12 {
     width: 100%;
   }
+  .row-fluid > .span13 {
+    width: 108.547008547%;
+  }
+  .row-fluid > .span14 {
+    width: 117.09401709400001%;
+  }
+  .row-fluid > .span15 {
+    width: 125.64102564100001%;
+  }
+  .row-fluid > .span16 {
+    width: 134.18803418800002%;
+  }
+  .row-fluid > .span17 {
+    width: 142.735042735%;
+  }
+  .row-fluid > .span18 {
+    width: 151.282051282%;
+  }
+  .row-fluid > .span19 {
+    width: 159.82905982900002%;
+  }
+  .row-fluid > .span20 {
+    width: 168.376068376%;
+  }
+  .row-fluid > .span21 {
+    width: 176.923076923%;
+  }
+  .row-fluid > .span22 {
+    width: 185.47008547000001%;
+  }
+  .row-fluid > .span23 {
+    width: 194.017094017%;
+  }
+  .row-fluid > .span24 {
+    width: 202.564102564%;
+  }
   input.span1, textarea.span1, .uneditable-input.span1 {
     width: 60px;
   }
@@ -625,6 +877,42 @@
   input.span12, textarea.span12, .uneditable-input.span12 {
     width: 1160px;
   }
+  input.span13, textarea.span13, .uneditable-input.span13 {
+    width: 1260px;
+  }
+  input.span14, textarea.span14, .uneditable-input.span14 {
+    width: 1360px;
+  }
+  input.span15, textarea.span15, .uneditable-input.span15 {
+    width: 1460px;
+  }
+  input.span16, textarea.span16, .uneditable-input.span16 {
+    width: 1560px;
+  }
+  input.span17, textarea.span17, .uneditable-input.span17 {
+    width: 1660px;
+  }
+  input.span18, textarea.span18, .uneditable-input.span18 {
+    width: 1760px;
+  }
+  input.span19, textarea.span19, .uneditable-input.span19 {
+    width: 1860px;
+  }
+  input.span20, textarea.span20, .uneditable-input.span20 {
+    width: 1960px;
+  }
+  input.span21, textarea.span21, .uneditable-input.span21 {
+    width: 2060px;
+  }
+  input.span22, textarea.span22, .uneditable-input.span22 {
+    width: 2160px;
+  }
+  input.span23, textarea.span23, .uneditable-input.span23 {
+    width: 2260px;
+  }
+  input.span24, textarea.span24, .uneditable-input.span24 {
+    width: 2360px;
+  }
   .thumbnails {
     margin-left: -30px;
   }
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d3026a294a..53f93a4825 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -170,6 +170,42 @@ a:hover {
 .span12 {
   width: 940px;
 }
+.span13 {
+  width: 1020px;
+}
+.span14 {
+  width: 1100px;
+}
+.span15 {
+  width: 1180px;
+}
+.span16 {
+  width: 1260px;
+}
+.span17 {
+  width: 1340px;
+}
+.span18 {
+  width: 1420px;
+}
+.span19 {
+  width: 1500px;
+}
+.span20 {
+  width: 1580px;
+}
+.span21 {
+  width: 1660px;
+}
+.span22 {
+  width: 1740px;
+}
+.span23 {
+  width: 1820px;
+}
+.span24 {
+  width: 1900px;
+}
 .container {
   width: 940px;
 }
@@ -206,6 +242,42 @@ a:hover {
 .offset11 {
   margin-left: 900px;
 }
+.offset12 {
+  margin-left: 980px;
+}
+.offset13 {
+  margin-left: 1060px;
+}
+.offset14 {
+  margin-left: 1140px;
+}
+.offset15 {
+  margin-left: 1220px;
+}
+.offset16 {
+  margin-left: 1300px;
+}
+.offset17 {
+  margin-left: 1380px;
+}
+.offset18 {
+  margin-left: 1460px;
+}
+.offset19 {
+  margin-left: 1540px;
+}
+.offset20 {
+  margin-left: 1620px;
+}
+.offset21 {
+  margin-left: 1700px;
+}
+.offset22 {
+  margin-left: 1780px;
+}
+.offset23 {
+  margin-left: 1860px;
+}
 .row-fluid {
   width: 100%;
   *zoom: 1;
@@ -260,6 +332,42 @@ a:hover {
 .row-fluid > .span12 {
   width: 99.99999998999999%;
 }
+.row-fluid > .span13 {
+  width: 108.510638287%;
+}
+.row-fluid > .span14 {
+  width: 117.02127658399999%;
+}
+.row-fluid > .span15 {
+  width: 125.531914881%;
+}
+.row-fluid > .span16 {
+  width: 134.042553178%;
+}
+.row-fluid > .span17 {
+  width: 142.553191475%;
+}
+.row-fluid > .span18 {
+  width: 151.063829772%;
+}
+.row-fluid > .span19 {
+  width: 159.57446806899998%;
+}
+.row-fluid > .span20 {
+  width: 168.085106366%;
+}
+.row-fluid > .span21 {
+  width: 176.595744663%;
+}
+.row-fluid > .span22 {
+  width: 185.10638296000002%;
+}
+.row-fluid > .span23 {
+  width: 193.617021257%;
+}
+.row-fluid > .span24 {
+  width: 202.127659554%;
+}
 .container {
   margin-left: auto;
   margin-right: auto;
@@ -759,6 +867,42 @@ input.span11, textarea.span11, .uneditable-input.span11 {
 input.span12, textarea.span12, .uneditable-input.span12 {
   width: 930px;
 }
+input.span13, textarea.span13, .uneditable-input.span13 {
+  width: 1010px;
+}
+input.span14, textarea.span14, .uneditable-input.span14 {
+  width: 1090px;
+}
+input.span15, textarea.span15, .uneditable-input.span15 {
+  width: 1170px;
+}
+input.span16, textarea.span16, .uneditable-input.span16 {
+  width: 1250px;
+}
+input.span17, textarea.span17, .uneditable-input.span17 {
+  width: 1330px;
+}
+input.span18, textarea.span18, .uneditable-input.span18 {
+  width: 1410px;
+}
+input.span19, textarea.span19, .uneditable-input.span19 {
+  width: 1490px;
+}
+input.span20, textarea.span20, .uneditable-input.span20 {
+  width: 1570px;
+}
+input.span21, textarea.span21, .uneditable-input.span21 {
+  width: 1650px;
+}
+input.span22, textarea.span22, .uneditable-input.span22 {
+  width: 1730px;
+}
+input.span23, textarea.span23, .uneditable-input.span23 {
+  width: 1810px;
+}
+input.span24, textarea.span24, .uneditable-input.span24 {
+  width: 1890px;
+}
 input[disabled],
 select[disabled],
 textarea[disabled],
@@ -1185,6 +1329,66 @@ table .span12 {
   width: 924px;
   margin-left: 0;
 }
+table .span13 {
+  float: none;
+  width: 1004px;
+  margin-left: 0;
+}
+table .span14 {
+  float: none;
+  width: 1084px;
+  margin-left: 0;
+}
+table .span15 {
+  float: none;
+  width: 1164px;
+  margin-left: 0;
+}
+table .span16 {
+  float: none;
+  width: 1244px;
+  margin-left: 0;
+}
+table .span17 {
+  float: none;
+  width: 1324px;
+  margin-left: 0;
+}
+table .span18 {
+  float: none;
+  width: 1404px;
+  margin-left: 0;
+}
+table .span19 {
+  float: none;
+  width: 1484px;
+  margin-left: 0;
+}
+table .span20 {
+  float: none;
+  width: 1564px;
+  margin-left: 0;
+}
+table .span21 {
+  float: none;
+  width: 1644px;
+  margin-left: 0;
+}
+table .span22 {
+  float: none;
+  width: 1724px;
+  margin-left: 0;
+}
+table .span23 {
+  float: none;
+  width: 1804px;
+  margin-left: 0;
+}
+table .span24 {
+  float: none;
+  width: 1884px;
+  margin-left: 0;
+}
 [class^="icon-"], [class*=" icon-"] {
   display: inline-block;
   width: 14px;
diff --git a/less/mixins.less b/less/mixins.less
index 80bfdf9459..0e33591f79 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -319,6 +319,15 @@
   }
 }
 
+// Table grid system
+// -------------------------
+.tableColumns(@columnSpan: 1) {
+  float: none; // undo default grid column styles
+  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16; // 16 is total padding on left and right of table cells
+  margin-left: 0; // undo default grid column styles
+}
+
+
 // Make a Grid
 // -------------------------
 // Use .makeRow and .makeColumn to assign semantic layouts grid system behavior
diff --git a/less/tables.less b/less/tables.less
index 089267d87f..1342de2ff6 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -129,11 +129,6 @@ table {
 // -----------------
 
 // Change the columns
-.tableColumns(@columnSpan: 1) {
-  float: none;
-  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16;
-  margin-left: 0;
-}
 table {
   .span1     { .tableColumns(1); }
   .span2     { .tableColumns(2); }