Commit for conditions, need some bug fixing
Backup
Merge branch 'master' into conditionsFromMockup

Conflicts:
	src/uCtrlCore/uCtrlCore.pro
Merge branch 'master' into conditionsFromMockup

Conflicts:
	src/uCtrlCore/uCtrlCore.pro
	src/uCtrlDesktop/data.json
	src/uCtrlDesktop/main.cpp
Merge pull request #90 from uCtrl/conditionsFromMockup

Editing of time conditions!