1
shop update
anther update
Merge branch 'McLeodDesktop'

Conflicts:
	CageFight/bin/CageFight.apk
	CageFight/bin/classes.dex
	CageFight/bin/resources.ap_