casey commit 2
Merge branch 'master' of https://github.com/CJLorax/gitTest2

Conflicts:
	ClassGame/Library/assetDatabase3
	ClassGame/Library/guidmapper