2
Merge branch 'master' into develop

Conflicts:

CollectionChangedView.xcodeproj/project.xcworkspace/xcuserdata/stephenzh
uang.xcuserdatad/UserInterfaceState.xcuserstate
dev
add a property
 s
add