Merge pull request #309 from elialejandro/master

Update to bootstrap 3.3.5

Author: weierophinney

public/css/bootstrap-theme.css

@@ -30,8 +30,7 @@ body {
   background-color: #57a900;
 }
 
-div.container a.brand {
-    background: url("../img/zf2-logo.png") no-repeat scroll 0 10px transparent;
-    margin-left: 0;
-    padding: 8px 20px 12px 40px;
-}
+div.container a.navbar-brand > img {
+    display: inline;
+    margin-right: 4px;
+}