Merge remote-tracking branch 'origin/systray' into mod_kombi
Merge remote-tracking branch 'origin/layerfix' into mod_kombi

Conflicts:
	README.md
Updated branch readme.