merge commit
Merge branch 'master' of https://github.com/openthinclient/openthinclient-os-applications

Conflicts:
	tcos-dev/tcos-dev-2.1/debian/files
	tcos-dev/tcos-dev-2.1/debian/tcos-dev/DEBIAN/control
added vmware-horizon package