Modified UTimeConditionWidget
Merge branch 'master' into conditionTouchUp
Merge branch 'master' into conditionTouchUp
Fixed the display of UTaskWidget
Broken piece of shit code
Merge branch 'master' into conditionTouchUp

Conflicts:
	src/uCtrlDesktop/qml/uCtrlDesktopQml/Scenario/UTaskWidget.qml
	src/uCtrlDesktop/qml/uCtrlDesktopQml/Scenario/UTimeConditionWidget.qml
	src/uCtrlDesktop/qml/uCtrlDesktopQml/UI/UComboBox.qml
Fixed UDateConditionWidget
Fixed the DeviceCondition which was not aligned
Merge pull request #105 from uCtrl/conditionTouchUp

Condition touch up