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

Conflicts:
	.DS_Store
	Resources/.DS_Store
	Resources/chatRoom.html
	Resources/controller/Home.js
	Resources/controller/MainFrame.js
	tiapp.xml
Merge branch 'master' of https://github.com/TitaniumTeam/iCasino

Conflicts:
	Resources/controller/Home.js
	Resources/view/vHome.js