Special
Merge branch 'master' into McLeodDesktop

Conflicts:
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/ClientGameScene$2.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/ClientGameScene.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$5.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$6$1.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene.class
special updated
gold and xp
Merge