Augmentation du test coverage pour Tickets
Merge branch 'master' of https://github.com/Archi2013/ulaval-sports-tickets.git
Recuperation du bon DemoData.xml
Merge branch 'master' of https://github.com/Archi2013/ulaval-sports-tickets.git
reorganisation des methodes de controlleurs
Merge branch 'master' of
https://github.com/Archi2013/ulaval-sports-tickets.git

Conflicts:
	resources/DemoData.xml
	src/main/java/ca/ulaval/glo4003/domain/tickets/Ticket.java
	src/test/java/ca/ulaval/glo4003/domain/services/PaymentServiceTest.java
	src/test/java/ca/ulaval/glo4003/domain/services/UserPreferencesServiceTest.java
	src/test/java/ca/ulaval/glo4003/domain/tickets/TicketTest.java
Merge branch 'master' of
https://github.com/Archi2013/ulaval-sports-tickets.git

Conflicts:
	src/test/java/ca/ulaval/glo4003/domain/tickets/GeneralTicketTest.java
	src/test/java/ca/ulaval/glo4003/domain/tickets/SeatedTicketTest.java