no message
no message
no message
no message
Merge branch 'master' of https://github.com/kofall/dafeiji

Conflicts:
	project_paperfight/Classes/Game/CMGameOverScene.cpp
	project_paperfight/Classes/Game/HelloWorld.cpp
	project_paperfight/Res/plane0_idle1.png
	project_paperfight/proj.ios/game_project.xcodeproj/project.pbxproj