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

Conflicts:
	.fastdev.lock