added dependency injection :)
Merge branch 'master' of https://github.com/sallesma/GLO4003
try to correct start bug
Correction de l’injection de dependance avec guice, il reste un bug dans UserController au cause des Resolver et dans XmlArayListConverter où le @Inject ne fonctionne pas
Bug correction
Merge branch 'master' of https://github.com/sallesma/GLO4003

Conflicts:
	src/main/java/com/glo4003/project/shoppingkart/controller/ShoppingCartController.java
	src/main/java/com/glo4003/project/user/controller/AdminController.java
	src/main/java/com/glo4003/project/user/helper/UserConverter.java
	src/main/java/com/glo4003/project/user/model/UserConcreteModel.java
Merge branch 'master' into dtremblay

Conflicts:
	src/main/java/com/glo4003/project/shoppingkart/controller/ShoppingCartController.java
	src/main/java/com/glo4003/project/user/controller/AdminController.java
update
merge bug correction + adding javax.mail dependancy in pom.xml