Something happened, more files
Merge remote-tracking branch 'origin/master'

Conflicts:
	proj/Library/CurrentLayout.dwlt
	proj/Library/expandedItems