Player -> BattlePlayer
Merge branch 'Refactor'