Fix battle schedule times
Merge branch 'master' into feature/fame-points