commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	source/Library/CurrentLayout.dwlt
	source/Library/assetDatabase3