Merge branch 'touch-toolbar' into unstable

Conflicts:
	src/main/webapp/scripts/interface.js

diff --cc src/main/webapp/scripts/interface.js
index 1f5e7a5,b3681db..6b6c132
--- 1/src/main/webapp/scripts/interface.js
--- 2/src/main/webapp/scripts/interface.js
+++ b/src/main/webapp/scripts/interface.js
@@@ -706,4 -744,4 +744,4 @@@ GuacamoleUI.attach = function(guac) 
          guac.sendKeyEvent(0, KEYSYM_CTRL);
      };
  
--};
++};