currentlayout is modified again
Merge remote-tracking branch 'origin/master'

Conflicts:
	dragonstomp/Library/CurrentLayout.dwlt