no message
Merge branch 'master' of github.com:shinsuo/PracCococs2dX

Conflicts:
	PracCococs2dX/Classes/GameScene.cpp
	PracCococs2dX/ccb/bomb.ccbi
+bomb completed,auto removed,changed fruit autoEffect