no message
Merge branch 'master' of https://github.com/gaiyongbo/poolGame

Conflicts:
	poolGameEx/poolGameEx/HelloWorldLayer.mm