fixes desktop file
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile
Fixes Makefile for packaging and local install.
Merge pull request #50 from pasgui/master

Compatibilty for debian and opensuse packaging.