corrected the ticket bug
Merge branch 'master' of https://github.com/sallesma/GLO4003
test updateUser
Complete unit tests on UserModel
unit test on admin controller
Ajout des tests unitaires sur UserService.modify()
Complete unit tests on MatchFilter
Merge branch 'master' of https://github.com/sallesma/GLO4003
corrected some tests
Add <tickets> to UserModel.xml and UserModel.template
Save match to xml when adding a ticket to Shopping Cart
Add concrete examples to XML files
Ajout de updateUser.jsp suite a l'erreur de GitHub
Ré-ajout des tests sur UserService.modify() suite au conflit GitHub
tickets added to matches are saved in .xml files
Création des vues bill et payment
follow des .jsp
the user can select in the shopping cart tickets to buy. They are displayed in the bill
add possibility to save search criterias
Merge branch 'master' of https://github.com/sallesma/GLO4003

Conflicts:
	src/main/java/database/files/UserModel.xml
	target/m2e-wtp/web-resources/META-INF/maven/com.glo4003/project/pom.properties