update
Merge branch 'master' of github.com:craigmin/testcocos2dx
update
Merge branch 'master' of github.com:craigmin/testcocos2dx

Conflicts:
	TestGame.mkb