something happened on pc
Merge branch 'test-without-metadata' of https://github.com/ElijahHudley/testing3 into test-without-metadata

Conflicts:
	xmldataloader/Library/ScriptAssemblies/Assembly-CSharp.dll
	xmldataloader/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	xmldataloader/Library/assetDatabase3