Wesh
Merge branch 'master' of https://github.com/Gaetan59/Projet-JavaM2I.git

Conflicts:
	src/main/java/com/formation/virgin/model/manager/MagasinManager.java