Merge branch 'master' into docs_derp

Conflicts:
	dist/css/bootstrap.min.css

1 files changed, 56 insertions, 23 deletions

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 252282efe..6aef1f6fd 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v3.0.1 by @fat and @mdo
+ * Bootstrap v3.0.2 by @fat and @mdo
  * Copyright 2013 Twitter, Inc.
  * Licensed under http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -996,6 +996,10 @@ pre code {
   right: 8.333333333333332%;
 }
 
+.col-xs-pull-0 {
+  right: 0;
+}
+
 .col-xs-push-12 {
   left: 100%;
 }
@@ -1044,6 +1048,10 @@ pre code {
   left: 8.333333333333332%;
 }
 
+.col-xs-push-0 {
+  left: 0;
+}
+
 .col-xs-offset-12 {
   margin-left: 100%;
 }
@@ -1092,6 +1100,10 @@ pre code {
   margin-left: 8.333333333333332%;
 }
 
+.col-xs-offset-0 {
+  margin-left: 0;
+}
+
 @media (min-width: 768px) {
   .container {
     width: 750px;
@@ -1181,6 +1193,9 @@ pre code {
   .col-sm-pull-1 {
     right: 8.333333333333332%;
   }
+  .col-sm-pull-0 {
+    right: 0;
+  }
   .col-sm-push-12 {
     left: 100%;
   }
@@ -1217,6 +1232,9 @@ pre code {
   .col-sm-push-1 {
     left: 8.333333333333332%;
   }
+  .col-sm-push-0 {
+    left: 0;
+  }
   .col-sm-offset-12 {
     margin-left: 100%;
   }
@@ -1253,6 +1271,9 @@ pre code {
   .col-sm-offset-1 {
     margin-left: 8.333333333333332%;
   }
+  .col-sm-offset-0 {
+    margin-left: 0;
+  }
 }
 
 @media (min-width: 992px) {
@@ -1344,6 +1365,9 @@ pre code {
   .col-md-pull-1 {
     right: 8.333333333333332%;
   }
+  .col-md-pull-0 {
+    right: 0;
+  }
   .col-md-push-12 {
     left: 100%;
   }
@@ -1380,6 +1404,9 @@ pre code {
   .col-md-push-1 {
     left: 8.333333333333332%;
   }
+  .col-md-push-0 {
+    left: 0;
+  }
   .col-md-offset-12 {
     margin-left: 100%;
   }
@@ -1416,6 +1443,9 @@ pre code {
   .col-md-offset-1 {
     margin-left: 8.333333333333332%;
   }
+  .col-md-offset-0 {
+    margin-left: 0;
+  }
 }
 
 @media (min-width: 1200px) {
@@ -1507,6 +1537,9 @@ pre code {
   .col-lg-pull-1 {
     right: 8.333333333333332%;
   }
+  .col-lg-pull-0 {
+    right: 0;
+  }
   .col-lg-push-12 {
     left: 100%;
   }
@@ -1543,6 +1576,9 @@ pre code {
   .col-lg-push-1 {
     left: 8.333333333333332%;
   }
+  .col-lg-push-0 {
+    left: 0;
+  }
   .col-lg-offset-12 {
     margin-left: 100%;
   }
@@ -1579,6 +1615,9 @@ pre code {
   .col-lg-offset-1 {
     margin-left: 8.333333333333332%;
   }
+  .col-lg-offset-0 {
+    margin-left: 0;
+  }
 }
 
 table {
@@ -1882,22 +1921,6 @@ output {
   vertical-align: middle;
 }
 
-.form-control:-moz-placeholder {
-  color: #999999;
-}
-
-.form-control::-moz-placeholder {
-  color: #999999;
-}
-
-.form-control:-ms-input-placeholder {
-  color: #999999;
-}
-
-.form-control::-webkit-input-placeholder {
-  color: #999999;
-}
-
 .form-control {
   display: block;
   width: 100%;
@@ -1924,6 +1947,22 @@ output {
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
 }
 
+.form-control:-moz-placeholder {
+  color: #999999;
+}
+
+.form-control::-moz-placeholder {
+  color: #999999;
+}
+
+.form-control:-ms-input-placeholder {
+  color: #999999;
+}
+
+.form-control::-webkit-input-placeholder {
+  color: #999999;
+}
+
 .form-control[disabled],
 .form-control[readonly],
 fieldset[disabled] .form-control {
@@ -4477,12 +4516,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   border-radius: 4px;
 }
 
-.navbar-toggle:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
 .navbar-toggle .icon-bar {
   display: block;
   width: 22px;