Fixed the bug in spells in battle
Merge remote-tracking branch 'origin/battle' into battle

Conflicts:
	src/com/arnopaja/supermac/battle/Battle.java
Merge remote-tracking branch 'origin/battle' into battle

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