Merge remote-tracking branch 'origin/master'

app/client/app.css

@@ -1184,3 +1184,7 @@ nav form input[type="image"]{
     height:100%;
     overflow: auto;
 }
+.navbar-default .navbar-nav .open .dropdown-menu>li>a,.navbar-default .navbar-nav .open .dropdown-menu {
+    background-color: rgba(102, 205, 170, 0.7);
+    color:#ffffff;
+}

app/client/templates/header.html

@@ -32,7 +32,6 @@
                             <li><a class="logout" href="#">Logout</a></li>
                         </ul>
                     </li>
-                    <li><a href="#" class="logout navbar-right">Logout</a></li>
                       <li>
                           <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_blank">
                               <input type="hidden" name="cmd" value="_s-xclick">