Create, move and delete conditions
Merge branch 'master' into moveConditions

Conflicts:
	src/uCtrlDesktop/qml/uCtrlDesktopQml/DeviceConfiguration/UDeviceConfigurationWidget.qml
Merge branch 'master' of github.com:uCtrl/Software into moveConditions
Add delete conditions + notify stuff
Merge pull request #60 from uCtrl/UComboboxFix

Fixed UCheckbox, the icon was not displaying properly
Merge pull request #59 from uCtrl/moveConditions

Conditions handling
Merge branch 'master' into UIconButton
Merge branch 'master' into UIconButton

Conflicts:
	src/uCtrlDesktop/qml/uCtrlDesktopQml/Scenario/UTaskWidget.qml