...
Merge branch 'master' of https://github.com/nikolaiRetamal/medimage.git

Conflicts:
	src/main/java/cnam/medimage/controller/controleur/AccueilImportContr.java