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

Conflicts:
	project_doodledafeiji/Classes/CMGameScene.cpp
no message
Merge branch 'master' of https://github.com/kofall/dafeiji
no message