Message Feed
UI
Merge
ai and mobs progress
Started on audio
Merge branch 'master' into mobs

Conflicts:
	UnityProject/Library/CurrentLayout.dwlt
	UnityProject/Library/CurrentMaximizeLayout.dwlt
	UnityProject/Library/EditorUserBuildSettings.asset
	UnityProject/Library/InspectorExpandedItems.asset
	UnityProject/Library/ScriptAssemblies/Assembly-CSharp.dll
	UnityProject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	UnityProject/Library/assetDatabase3
	UnityProject/Library/guidmapper
	UnityProject/Library/metadata/d1/d19888fd5fa167949a141d3633101cb0
Merge branch 'mobs'
City Status And More Messages
Merge remote-tracking branch 'alex/master'

Conflicts:
	UnityProject/Assets/Scrpits/Building.cs
	UnityProject/Library/CurrentLayout.dwlt
	UnityProject/Library/CurrentMaximizeLayout.dwlt
	UnityProject/Library/InspectorExpandedItems.asset
	UnityProject/Library/ScriptAssemblies/Assembly-CSharp.dll
	UnityProject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	UnityProject/Library/assetDatabase3
	UnityProject/Library/guidmapper
	UnityProject/Library/metadata/a6/a6ffe317736e34b49a4c15ab6074d3a3
	UnityProject/Library/metadata/ce/ce53c4653b27b4e4392c5fc858b2f904
Fix warning