Merge branch 'master' of ssh://github.com/dockmeister/quafe-etk

Conflicts:
	data/quafe-etk.desktop
Merge branch 'master' of ssh://github.com/dockmeister/quafe-etk

Conflicts:
	data/quafe-etk.desktop