Bug fixes
Merge pull request #100 from uCtrl/bugFixes

Bug fixes
Merge branch 'master' into otherDevicesConditions

Conflicts:
	src/uCtrlCore/Conditions/ucondition.h