ss
Merge branch 'master' into develop

Conflicts:

TestGit.xcodeproj/project.xcworkspace/xcuserdata/yuanbo.xcuserdatad/User
InterfaceState.xcuserstate
	TestGit/Classes/HelloWorldScene.cpp