commit5
Merge branch 'temp' into ma

Conflicts:
	Library/assetDatabase3