Merge branch 'branch'

Conflicts:
Test/Test.xcodeproj/project.xcworkspace/xcuserdata/pierremarcairoldi.xcu
serdatad/UserInterfaceState.xcuserstate
Test/Test/main.cpp