Created branch and files, gotta hop on a PR
Input basic states
Add placeholder text
Removed useless method
Refactor UConditions Pass on enums + jsonify
Fix listview scroll
Merge pull request #64 from uCtrl/NavBarFix

Fixed the NavBar by adding tooltips
Merge pull request #63 from uCtrl/Textbox

Textbox
Merge pull request #58 from uCtrl/conditions

Refactor Conditions
Variable QML component following Condition type
Cleanup + adjust date display
PR review fix
Merge pull request #67 from uCtrl/conditionType

Conditions QML display
Merge branch 'master' into ULabelRefactor

Conflicts:
	src/uCtrlDesktop/qml/uCtrlDesktopQml/Home/UHome.qml
	src/uCtrlDesktop/qml/uCtrlDesktopQml/Scenario/UTimeConditionWidget.qml
	src/uCtrlDesktop/uCtrlDesktop.pro