fixed mess up in changes
Merge branch 'Colin-Dev' into BattleUI