Commit des Merges Simpson
Merge branch 'master' of https://github.com/Gaetan59/Projet-JavaM2I.git

Conflicts:
	src/test/java/com/formation/virgin/manager/test/MagasinManagerImplTest.java