Fixed caching for items
Merge remote-tracking branch 'origin/battle_test' into battle_test

Conflicts:
	src/com/arnopaja/supermac/battle/BattleTest.java