-Update Logic for Battle
Merge branch 'master' of https://github.com/VinhLoc/HeroTale

Conflicts:
	HeroTales/Assets/-tk2d.asset
	HeroTales/HeroTales-csharp.sln
	HeroTales/HeroTales.sln
	HeroTales/HeroTales.userprefs
- Test upload userprefs