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

Conflicts:
	third_party/Lihui2048Api/Lihui2048Api/bin/lihui2048api.jar