Commit Master
Merge branch 'NewFeature'
sdf
hu
Merge branch 'NewFeature'

Conflicts:

Test.xcodeproj/project.xcworkspace/xcuserdata/Developer.xcuserdatad/User
InterfaceState.xcuserstate
jhkf
Merge branch 'NewFeature'
Master
Merge branch 'master' into NewFeature