Merge branch 'unstable' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole...

diff --cc src/main/webapp/index.html
index 490564a,8ceeabe..9cab99f
--- 1/src/main/webapp/index.html
--- 2/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@@ -80,10 -84,10 +84,10 @@@
                  </div>
  
                  <button id="showKeyboard">Show Keyboard</button>
 -                <button id="CtrlAltDelete">Ctrl-Alt-Delete</button>
 +                <button id="ctrlAltDelete">Ctrl-Alt-Delete</button>
  
                  <!-- Logo and status -->
-                 <img id="logo" src="images/guacamole-logo.png" alt="Guacamole" title="Guacamole 0.4.0"/>
+                 <img id="status-logo" class="logo" src="images/guacamole-logo-24.png" alt="Guacamole" title="Guacamole ${project.version}"/>
                  <span id="state"></span>
  
                  <a href="agpl-3.0-standalone.html"><img id="license" src="images/agpl-logo.png" alt="AGPLv3"/></a>