More battle fixes
Merge branch 'master' of https://github.com/TeamSazeracProject/TheGame