MAJ parc et jardins
Merge branch 'master' of
https://github.com/masterALMA2016/openDataWrapper.git

Conflicts:
	src/main/resources/mapping.properties