Mapping Commandite, founisseur, item,
Merge branch 'master' of https://github.com/sturcotte06/sporacid-gcs

Conflicts:
	src/gcs.webservices/web-content/WEB-INF/application-context.xml