fix
Merge branch 'convertisseurJSONtoBtrPlace' into constraints__feedBack

Conflicts:
	src/main/ressources/g5kMock.json