diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 347bf9bb..d7a70bff 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 39ee144e..4ee60774 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -687,7 +687,8 @@ input[type="file"]:focus, input[type="checkbox"]:focus, select:focus {
 input[class*="span"],
 select[class*="span"],
 textarea[class*="span"],
-.uneditable-input {
+.uneditable-input,
+.uneditable-textarea {
   float: none;
   margin-left: 0;
 }
@@ -1000,7 +1001,7 @@ textarea.editor-ckeditor {
   padding-left: 5px;
 }
 .input-prepend, .input-append {
-  margin-bottom: 5px;
+  margin-bottom: 0px;
   *zoom: 1;
 }
 .input-prepend:before,
diff --git a/docs/base-css.html b/docs/base-css.html
index 142296f9..644e6e9b 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1909,6 +1909,21 @@ on multiple lines
     <script src="assets/js/bootstrap-table-href.js"></script>
     <script src="assets/js/application.js"></script>
 
+    <!-- Analytics
+    ================================================== -->
+    <script>
+      var _gauges = _gauges || [];
+      (function() {
+        var t   = document.createElement('script');
+        t.type  = 'text/javascript';
+        t.async = true;
+        t.id    = 'gauges-tracker';
+        t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
+        t.src = '//secure.gaug.es/track.js';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(t, s);
+      })();
+    </script>
 
   </body>
 </html>
diff --git a/docs/components.html b/docs/components.html
index 0041a7da..f8db87d7 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1583,6 +1583,21 @@
     <script src="assets/js/bootstrap-table-href.js"></script>
     <script src="assets/js/application.js"></script>
 
+    <!-- Analytics
+    ================================================== -->
+    <script>
+      var _gauges = _gauges || [];
+      (function() {
+        var t   = document.createElement('script');
+        t.type  = 'text/javascript';
+        t.async = true;
+        t.id    = 'gauges-tracker';
+        t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
+        t.src = '//secure.gaug.es/track.js';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(t, s);
+      })();
+    </script>
 
   </body>
 </html>
diff --git a/docs/download.html b/docs/download.html
index 31accd9a..49f0fac7 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -361,6 +361,21 @@
     <script src="assets/js/bootstrap-table-href.js"></script>
     <script src="assets/js/application.js"></script>
 
+    <!-- Analytics
+    ================================================== -->
+    <script>
+      var _gauges = _gauges || [];
+      (function() {
+        var t   = document.createElement('script');
+        t.type  = 'text/javascript';
+        t.async = true;
+        t.id    = 'gauges-tracker';
+        t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
+        t.src = '//secure.gaug.es/track.js';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(t, s);
+      })();
+    </script>
 
   </body>
 </html>
diff --git a/docs/examples.html b/docs/examples.html
index 288c8963..7180dac3 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -144,6 +144,21 @@
     <script src="assets/js/bootstrap-table-href.js"></script>
     <script src="assets/js/application.js"></script>
 
+    <!-- Analytics
+    ================================================== -->
+    <script>
+      var _gauges = _gauges || [];
+      (function() {
+        var t   = document.createElement('script');
+        t.type  = 'text/javascript';
+        t.async = true;
+        t.id    = 'gauges-tracker';
+        t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
+        t.src = '//secure.gaug.es/track.js';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(t, s);
+      })();
+    </script>
 
   </body>
 </html>
diff --git a/docs/index.html b/docs/index.html
index dd78ff42..e9c6cc1c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -256,6 +256,21 @@
     <script src="assets/js/bootstrap-table-href.js"></script>
     <script src="assets/js/application.js"></script>
 
+    <!-- Analytics
+    ================================================== -->
+    <script>
+      var _gauges = _gauges || [];
+      (function() {
+        var t   = document.createElement('script');
+        t.type  = 'text/javascript';
+        t.async = true;
+        t.id    = 'gauges-tracker';
+        t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
+        t.src = '//secure.gaug.es/track.js';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(t, s);
+      })();
+    </script>
 
   </body>
 </html>
diff --git a/docs/javascript.html b/docs/javascript.html
index bc5db689..03440290 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1598,6 +1598,21 @@ $('.myCarousel').carousel({
     <script src="assets/js/bootstrap-table-href.js"></script>
     <script src="assets/js/application.js"></script>
 
+    <!-- Analytics
+    ================================================== -->
+    <script>
+      var _gauges = _gauges || [];
+      (function() {
+        var t   = document.createElement('script');
+        t.type  = 'text/javascript';
+        t.async = true;
+        t.id    = 'gauges-tracker';
+        t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
+        t.src = '//secure.gaug.es/track.js';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(t, s);
+      })();
+    </script>
 
   </body>
 </html>
diff --git a/docs/less.html b/docs/less.html
index 5266689f..e5953379 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -794,6 +794,21 @@
     <script src="assets/js/bootstrap-table-href.js"></script>
     <script src="assets/js/application.js"></script>
 
+    <!-- Analytics
+    ================================================== -->
+    <script>
+      var _gauges = _gauges || [];
+      (function() {
+        var t   = document.createElement('script');
+        t.type  = 'text/javascript';
+        t.async = true;
+        t.id    = 'gauges-tracker';
+        t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
+        t.src = '//secure.gaug.es/track.js';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(t, s);
+      })();
+    </script>
 
   </body>
 </html>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 46ca224e..02085ce3 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -437,6 +437,21 @@
     <script src="assets/js/bootstrap-table-href.js"></script>
     <script src="assets/js/application.js"></script>
 
+    <!-- Analytics
+    ================================================== -->
+    <script>
+      var _gauges = _gauges || [];
+      (function() {
+        var t   = document.createElement('script');
+        t.type  = 'text/javascript';
+        t.async = true;
+        t.id    = 'gauges-tracker';
+        t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
+        t.src = '//secure.gaug.es/track.js';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(t, s);
+      })();
+    </script>
 
   </body>
 </html>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 89484e66..2b895345 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1380,7 +1380,6 @@ $('.myCarousel').carousel({
       </div>
     </section>
 
-<<<<<<< HEAD
 
 
     <!-- Placeholder
diff --git a/docs/upgrading.html b/docs/upgrading.html
index ba1c8b17..93b50eee 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -296,6 +296,21 @@
     <script src="assets/js/bootstrap-table-href.js"></script>
     <script src="assets/js/application.js"></script>
 
+    <!-- Analytics
+    ================================================== -->
+    <script>
+      var _gauges = _gauges || [];
+      (function() {
+        var t   = document.createElement('script');
+        t.type  = 'text/javascript';
+        t.async = true;
+        t.id    = 'gauges-tracker';
+        t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
+        t.src = '//secure.gaug.es/track.js';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(t, s);
+      })();
+    </script>
 
   </body>
 </html>