Shop stage 2
Shop update
12
Merge branch 'ai3'

Conflicts:
	CageFight/bin/CageFight.apk
	CageFight/bin/classes.dex
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$1.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$2.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$3.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene$4.class
	CageFight/bin/classes/co/nz/splashYay/cagefight/scenes/GameScene.class
	CageFight/bin/resources.ap_
	CageFight/src/co/nz/splashYay/cagefight/scenes/GameScene.java