Parc et jardin + art comptemporain
Merge branch 'master' of
https://github.com/masterALMA2016/openDataWrapper.git

Conflicts:
	src/main/resources/dataSources.xml
	src/main/resources/fusekiConfig.ttl
	src/main/resources/mapping.properties