fixplz
Merge branch 'Josh-branch' of https://github.com/Borimir/Shammons2 into Josh-branch

Conflicts:
	NewGame/Library/AssetServerCacheV3
	NewGame/Library/assetDatabase3
	NewGame/Library/guidmapper
	NewGame/NewGame.userprefs