Merge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master

Conflicts:
	dist/css/bootstrap.min.css

dist/css/bootstrap.css

@@ -1578,6 +1578,7 @@ table th[class*="col-"] {
     overflow-x: scroll;
     overflow-y: hidden;
     border: 1px solid #dddddd;
+    -webkit-overflow-scrolling: touch;
   }
   .table-responsive > .table {
     margin-bottom: 0;

less/tables.less

@@ -187,6 +187,7 @@ table {
     overflow-y: hidden;
     overflow-x: scroll;
     border: 1px solid @table-border-color;
+    -webkit-overflow-scrolling: touch;
 
     // Tighten up spacing and give a background color
     > .table {