test1
Merge branch 'testxmlloader-problem' of https://github.com/ElijahHudley/testing3 into testxmlloader-problem

Conflicts:
	xmldataloader/Library/assetDatabase3
	xmldataloader/Library/expandedItems