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

Conflicts:
	Resources/app.js
cc
ffff