aa
a
aa
Merge branch 'master' of https://github.com/TitaniumTeam/iCasino

Conflicts:
	Resources/assets/images/SanSang/scrollGame.png
	Resources/assets/images/Setting/MoiChoi.png
	Resources/assets/images/Setting/line.png
	Resources/controller/childrenController/InviteFriend.js
	Resources/controller/childrenController/XepHang2.js
	Resources/view/childrenView/vInviteFriend.js
	Resources/view/vGame/vBanChoi_thanhhv.js
	Resources/view/vUserAvatar_thanhhv.js