输入玩家昵称
Merge branch 'master' of github.com:craigmin/testcocos2dx

Conflicts:
	TestGame.mkb
	source/GameLayer.cpp