initial layouts per desktop
Merge remote-tracking branch 'origin/initlayouts'

Conflicts:
	config.def.h