Fixed bugs

~ replaced critical values with if-constants
Resolved conflict
Resolving conflicts
Added User Interface State file
Resolving issues
Resolving issues
Resolving file issues
Resolving file issues
Merge branch 'v1.1'

Conflicts:
	validator/validator.xcodeproj/project.xcworkspace/xcuserdata/Macbook.xcuserdatad/UserInterfaceState.xcuserstate
	validator/validator.xcodeproj/xcuserdata/Macbook.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist