GUI fiddling
Merge branch 'master' into Ace
Cleaning and adding of Building/Action lists
fiddling
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'