Removed "Install" from boot menu to avoid accident
Merge remote-tracking branch 'origin/develop' into develop
Move desctop-directories -> desktop-directories, fix typo.
Merge branch 'release-1.3' into develop
Merge branch 'develop' of github.com:cmsi/MateriAppsLive into develop
Merge branch 'develop' of github.com:cmsi/MateriAppsLive into develop

Conflicts:
	live/config/includes.chroot/usr/share/desktop-directories/materiapps.desktop
Delete unused desktop file.
Install abinit-data as well. This package contains pseudopotentials and examples.
Moved to ermod branch
Moved to ermod branch
Added Imagemagick
Fixed Issue #68
Merge remote-tracking branch 'origin/develop' into develop
Removed abinit-data package.  It does not exist for wheezy
Added smash and ermod-example-gromacs packages
Bumped to version 1.4
Added release note
Add openmx-data and openmx-example package to install.
Added openmx-data and openmx-example for version 3.7
Merge remote-tracking branch 'origin/release-1.4' into release-1.4