Revert "Attempting to Merge"

This reverts commit 5c2e7934293b248bab9bf1bb1e5189a84996f590.

Conflicts:
	SEModAPIExtensions/API/BasicUnitTestManager.cs
	SEModAPIExtensions/Properties/AssemblyInfo.cs
	SEModAPIInternal/API/Common/PlayerManager.cs
	SEModAPIInternal/Properties/AssemblyInfo.cs
	SEServerExtender/Properties/AssemblyInfo.cs