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

Conflicts:
	project/Classes/Game/CMGamePauseLayer.cpp