retrait des billets dans paniers après paiement
Added logging aspect
added payment log (aspect)
Modify aspect to have parameters in log files and add the bootLoader
Merge branch 'master' of https://github.com/sallesma/GLO4003

Conflicts:
	src/main/java/com/glo4003/project/PaymentController.java
	src/main/java/com/glo4003/project/database/model/UserModel.java
	src/main/webapp/WEB-INF/views/payment.jsp
Update readme to add installation information
Merge branch 'master' of https://github.com/sallesma/GLO4003
Created MatchViewModel and MatchConverter
Ajout de MatchConcreteModel
Adding dependancies injection for MatchController
Bug correction on addTickets jsp cause by ID renaming on MatchModel
adding dependancies injection for ShoppingCartController and AdminController
Add UserConcreteModel and repackaging
Add UserConcreteModel and repackaging
Correction de tests
Instantiate Ticket View Models & Converter
Merge branch 'master' of https://github.com/sallesma/GLO4003

Conflicts:
	src/main/java/com/glo4003/project/database/model/MatchModel.java
	src/main/java/com/glo4003/project/database/model/UserModel.java
	src/main/java/com/glo4003/project/match/controller/MatchController.java
	src/main/java/com/glo4003/project/match/helper/MatchConverter.java
	src/main/java/com/glo4003/project/match/helper/MatchFilter.java
	src/main/java/com/glo4003/project/shoppingkart/controller/ShoppingCartController.java
	src/main/java/com/glo4003/project/user/helper/UserConverter.java
Solve conflicts on ConcreteModels
Clean matchController
Clean ShoppingCartController