correction problème compilation
Merge branch 'master' of https://github.com/Gaetan59/Projet-JavaM2I.git
ta merde
Merge branch 'master' of https://github.com/Gaetan59/Projet-JavaM2I.git
Prochainement sur vos écrans episode 2 Les Tests av Mockito
Merge branch 'master' of https://github.com/Gaetan59/Projet-JavaM2I.git

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