Force Fix (SO MUCH FORCE)
Fixed everything, maybe.
Merge commit '476ee2cd39ff578d268b8312d38faa619abf2513' into Anthony

Conflicts:
	The Project/Assembly-CSharp-vs.csproj
	The Project/Assembly-CSharp.csproj
	The Project/The Project-csharp.sln
	The Project/The Project.sln
	The Project/The Project.userprefs
Force Update