meta
Merge branch 'master' of https://github.com/lornz/Albatross

Conflicts:
	Albatross/Library/CurrentLayout.dwlt
	Albatross/Library/expandedItems
	Albatross/Library/guidmapper