Fixed npcs, added turret base
Merge branch 'master' of https://github.com/AlexHayton/UnityTestProject2

Conflicts:
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assets/TestProject/Scenes/test.unity