Fix some more battle system bugs
Merge remote-tracking branch 'origin/master'