Add Sensor device
Fix graphic z order
Merge branch 'master' into addSensor

Conflicts:
	src/uCtrlDesktop/Resources.qrc
Merge branch 'addSensor'