update
Merge branch 'master' into McLeodLaptop

Conflicts:
	CageFight/bin/CageFight.apk
	CageFight/bin/classes.dex
	CageFight/bin/classes/co/nz/splashYay/cagefight/SlowRepeatingTask.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/ServerGameScene$1.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/ServerGameScene$2.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/ServerGameScene.class
	CageFight/bin/resources.ap_
	CageFight/src/co/nz/splashYay/cagefight/SlowRepeatingTask.java
	CageFight/src/co/nz/splashYay/cagefight/scenes/ServerGameScene.java
Team Colours, AI respawn, Bug fix
joystick fix