Passage du json au xml
Merge branch 'master' of https://github.com/vruffet/PED_BackEnd.git

Conflicts:
	src/main/java/com/ped/project/service/ServiceEDT.java