Modifications basées sur tuto
Merge branch 'master' of github.com:matthis-d/EJB-geonotes

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