testing
Merge remote-tracking branch 'origin/master'

Conflicts:
	Spectrum/Library/CurrentLayout.dwlt
	Spectrum/Library/guidmapper