//
//
//
//
//
Merge branch 'master' of https://github.com/TitaniumTeam/iCasino_v2

Conflicts:
	Classes/LayerPlayGameChinessChess.cpp
	Classes/LayerPlayGameChinessChess.h
	Classes/LayerPlayGamePhom.cpp
	Classes/LayerPlayGameTLMN.cpp
	Classes/LayerPlayGameTLMN.h
	Classes/_Avatar_.cpp
	Classes/_Avatar_.h
	Classes/_Avatar_inGame_.cpp
	Classes/_Avatar_inGame_.h