GUI fiddling
Merge branch 'master' into Ace
Cleaning and adding of Building/Action lists
fiddling
Added basic monster script
CityDataScript
CityDataUpdateSpawnImplemented
Edits
Merge branch 'master' into Ace

Conflicts:
	Assets/Scenes/CityView3.unity
	ProjectSettings/TagManager.asset
Temporary GUI functioning (final GUI will be much prettier)
Merge branch 'Ace'
CityView3Back
Camera
Merge branch 'Weili-Gu'
Merge branch 'master' into Weili-Gu
Merge branch 'master' of https://github.com/weiligu/ItinerantCity

Conflicts:
	Assets/Prefabs/soldier.prefab
	Assets/Resources/enemy1.prefab
	Assets/Scenes/CityView3.unity
Merge branch 'master' into Weili-Gu