update 1.2 by zyWu
no change
Merge branch 'master' of https://github.com/vegligi/chickenWingsApps-001

Conflicts:
	Classes/GameScene.cpp
	Json data format.txt
	proj.ios/HelloWorldProjectForTestingCocos2dxCrossPlatforms.xcodeproj/project.xcworkspace/xcuserdata/vegligi.xcuserdatad/UserInterfaceState.xcuserstate