Going to cause a merge conflict
Merge branch 'LoadingTests' of github.com:Bacon41/PantheonPrototype into LoadingTests

Conflicts:
	PantheonPrototype.sln
	PantheonPrototype/PantheonPrototype/Pantheon.cs
	PantheonPrototype/PantheonPrototype/PantheonPrototype.csproj
	PantheonPrototype/PantheonPrototypeContent/PantheonPrototypeContent.contentproj
	Test/Properties/AssemblyInfo.cs
	Test/Test.csproj
	Test/XMLTest.cs