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

Conflicts:
	.DS_Store
	Resources/.DS_Store
	Resources/images/.DS_Store
	Resources/view/.DS_Store