//spec 3cay
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/LayerChonBanChoi.cpp
Merge branch 'master' of https://github.com/TitaniumTeam/iCasino_v2

Conflicts:
	Classes/LayerChonBanChoi.cpp
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit aee98270ca29b95f22e6fc577e3a7ed13d8c7424.