Added end battle and a link back to the challenger.

Required a few changes. Made battle template more granular.
Changed doesCharacterHaveActiveBattle method to return the battle id if
so. Also changed the get Opponent character object to take in the battle
id rather than to rely on status. This is so we can load old battles.