Merge pull request #5 from depp/master

Stomp humans in the city
Audio
Merge
Monster Controls
yet another merge
Merge remote-tracking branch 'alex/master'

Conflicts:
	UnityProject/Assets/Prefabs/Building.prefab
	UnityProject/Assets/Prefabs/BuildingSpawnPrefab.prefab
	UnityProject/Library/CurrentLayout.dwlt
	UnityProject/Library/CurrentMaximizeLayout.dwlt
	UnityProject/Library/ScriptAssemblies/Assembly-CSharp.dll
	UnityProject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	UnityProject/Library/assetDatabase3
	UnityProject/Library/guidmapper