comment
Merge branch 'master' of https://github.com/SpaceEngineerMods/SpaceEngineersTestScripts

Conflicts:
	Data/Scripts/TestScript/TestScript.v12.suo
	Teleporter/Data/Scripts/Teleporter/Teleporter.cs
	Teleporter/Data/Scripts/Teleporter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache