before merge commit
Merge branch 'master' into rogerraa

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper
Merge branch 'rogerraa'