+ttyUSB1
-ttyACM0
New controller commands fix
Merge branch 'master' of github.com:ssmehov/Jivko

Conflicts:
	db/commands.xml