..
Merge branch 'master' of https://github.com/weiligu/ItinerantCity

Conflicts:
	Assets/Animation/soldier/soldierIdle.anim.meta
	Assets/Animation/soldier/soldierMove.controller.meta
	Assets/Animation/soldier/soldierMoveEast.anim.meta
	Assets/Animation/soldier/soldierMoveNorth.anim.meta
	Assets/Animation/soldier/soldierMoveNorthEast.anim.meta
	Assets/Animation/soldier/soldierMoveNorthWest.anim.meta
	Assets/Animation/soldier/soldierMoveSouth.anim.meta
	Assets/Animation/soldier/soldierMoveSouthEast.anim.meta
	Assets/Animation/soldier/soldierMoveSouthWest.anim.meta
	Assets/Animation/soldier/soldierMoveWest.anim.meta
	Assets/Scenes/CityView3.unity