ignoring eclipse files
Merge branch 'master' of https://github.com/seustachi/DISP-MELM
facets compatible with java 1.7
Link between Library and Icon
Merge branch 'master' of https://github.com/seustachi/DISP-MELM

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.project.facet.core.xml