Editted stuff for Battle
Merge branch 'develop' of https://github.com/lin331/Skirmish into develop