api rest
Merge branch 'master' of https://github.com/catdiop/Cnrs

Conflicts:
	src/enseirb/t3/ressource/AtelierRessource.java