Fixed Bug in ArenaData

Fixed ArenaData.isBattleInProgress() - it was returning an invalid
result and causing an NPE.
Merge remote-tracking branch 'upstream/master'