touch osc layout
Merge branch 'gui_refining'

Conflicts:
	bin/data/settings.xml