Merge branch 'master' into platformFilter

Conflicts:
	src/uCtrlDesktop/qml/uCtrlDesktopQml/System/USystem.qml
Merge pull request #80 from uCtrl/platformFilter

Filter for platforms
Merge branch 'cssSystem'

Conflicts:
	src/uCtrlDesktop/qml/uCtrlDesktopQml/System/USystem.qml
U Combobox Display fix