Merge branch 'game_fight_ai' into game_fight_ai_main

Conflicts:
	scripts/app/character/views/HeroView.lua
	scripts/app/mediator/hero/hero.lua
	scripts/app/scenes/battle/map/Map.lua