Merge branch 'master' of https://github.com/azatris/zed

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Prefabs/MiniTurret.prefab
	Assets/Prefabs/ScannerTurret.prefab
	Assets/Scenes/scene.unity
	ProjectSettings/TagManager.asset