Merge branch 'dev'

Conflicts:
	tcserver/conf/home/fluxbox/autostart.sh

diff --cc tcserver/conf/home/fluxbox/autostart.sh
index 03e9fc62846154e093777b7faf3f4be846289f7e,535ce693787562171a194b06586cf8e4e9771ce7..781816f86bcd75a7cbd649ac148ee974b9b9fb05
--- 1/tcserver/conf/home/fluxbox/autostart.sh
--- 2/tcserver/conf/home/fluxbox/autostart.sh
+++ b/tcserver/conf/home/fluxbox/autostart.sh
@@@ -4,8 -6,7 +6,6 @@@
  
  pid=`pgrep jack-rack`
  
- # Audio channel
--
  if [ ! $pid = "" ]; then
   sleep 1
  else