Battle scene to master

Merged 대현 김 requested to merge BattleScene into master

Merge request reports