Merge branch 'beta001'
....
Merge branch 'master' of https://github.com/evx001/ExploreUISegControl

Conflicts:

ExploreUISegControl.xcodeproj/project.xcworkspace/xcuserdata/evx001.xcus
erdatad/UserInterfaceState.xcuserstate