Merge branch 'master' into conditionsFromMockup

Conflicts:
	src/uCtrlCore/uCtrlCore.pro