Valot
Merge remote branch 'origin/master'

Conflicts:
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper