JUnits MaterialManager
Merge branch 'master' of github.com:marinadelerce/gestionmateriel

Conflicts:
	src/controller/Controller.java
	src/model/manager/GeneralManager.java
	src/model/manager/MaterialManager.java
	src/model/material/Stock.java
	tests/model/manager/MaterialManagerTest.java
Conflicts resolved!

Merge branch 'master' of github.com:marinadelerce/gestionmateriel

Conflicts:
	src/model/general/GeneralManager.java
	src/model/general/UserManager.javaConflicts resolved!

Merge branch 'master' of github.com:marinadelerce/gestionmateriel

Conflicts:
	src/model/general/GeneralManager.java
	src/model/general/UserManager.java