Menu icons and desktop file added. Makefile modified accordingly.
fix merge conflict
Merge branch 'v2e-master'