setup for texture addition
fixing conflicts

Conflicts:
	scaryHospital/Library/AssetServerCacheV3
	scaryHospital/Library/CurrentLayout.dwlt
	scaryHospital/Library/assetDatabase3
	scaryHospital/Library/expandedItems
	scaryHospital/Library/guidmapper