-Update logic for battle
Merge branches 'master' and 'master' of https://github.com/VinhLoc/HeroTale

Conflicts:
	HeroTales/Assembly-CSharp-vs.csproj
	HeroTales/Assembly-CSharp.csproj
	HeroTales/Assets/-tk2d.asset
	HeroTales/Assets/Scene/BattleScene.unity
	HeroTales/HeroTales-csharp.sln
	HeroTales/HeroTales.sln
	HeroTales/HeroTales.userprefs
- Merge