retrait des billets dans paniers après paiement
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
Merge branch 'master' of https://github.com/sallesma/GLO4003