Merge branch 'hotfix/hotfix_battle' into develop
add feature 3 to almost