bugfix
renaming stuff
moving battle period back up
Merge remote-tracking branch 'origin/master'