Merge branch 'master' into docs_derp

Conflicts:
	docs/_includes/footer.html
	docs/assets/css/docs.css

diff --cc docs/_includes/footer.html
Simple merge

diff --cc docs/assets/css/docs.css
index d722e7e0225b28e9cc4172eb8556333c0fa474f3,58e6fa64ad0900d3b29ce7bb3d50026acf722f7d..e1298380710219b66e8f1330e6779682322a2d50
--- 1/docs/assets/css/docs.css
--- 2/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@@ -115,26 -88,35 +115,31 @@@ body 
   */
  
  .bs-docs-nav {
 -  text-shadow: 0 -1px 0 rgba(0,0,0,.15);
 -  background-color: #563d7c;
 -  border-color: #463265;
 -  box-shadow: 0 1px 0 rgba(255,255,255,.1);
 -}
 -.bs-docs-nav .navbar-collapse {
 -  border-color: #463265;
 -}
 -.bs-docs-nav .navbar-brand {
 -  color: #fff;
 +  background-color: #fff;
 +  border-color: #e5e5e5;
 +  box-shadow: 0 0 10px rgba(0,0,0,.05);
  }
 +.bs-docs-nav .navbar-brand,
  .bs-docs-nav .navbar-nav > li > a {
 -  color: #cdbfe3;
 -}
 -.bs-docs-nav .navbar-nav > li > a:hover {
 -  color: #fff;
 +  color: #563d7c;
 +  font-weight: 500;
  }
 +.bs-docs-nav .navbar-nav > li > a:hover,
  .bs-docs-nav .navbar-nav > .active > a,
  .bs-docs-nav .navbar-nav > .active > a:hover {
 -  color: #fff;
 -  background-color: #463265;
 +  color: #463265;
 +  background-color: #f9f9f9;
 +}
 +.bs-docs-nav .navbar-toggle .icon-bar {
 +  background-color: #563d7c;
  }
- .bs-docs-nav .navbar-toggle:hover {
+ .bs-docs-nav .navbar-header .navbar-toggle {
 -  border-color: #563d7c;
++  border-color: #fff;
+ }
+ .bs-docs-nav .navbar-header .navbar-toggle:hover,
+ .bs-docs-nav .navbar-header .navbar-toggle:focus {
 -  background-color: #463265;
 -  border-color: #463265;
 +  background-color: #f9f9f9;
++  border-color: #f9f9f9;
  }