Travel shits
On continue le travail un peu avant de faire le party
Fixed + added ExpenseController tests
Fixed + added tests in TimeController
Travel working now
Travel working now
Merge branch 'TravelMarieShan' of https://github.com/teanutella/AppEmployee into TravelMarieShan
everything is SUPPOSED to work :)
Last fix
Ajout des tests pour TravelController
Merge remote-tracking branch 'origin/TravelMarieShan'

Conflicts:
	src/main/java/ca/ulaval/glo4003/appemployee/persistence/XMLTravelRepository.java
	src/main/java/ca/ulaval/glo4003/appemployee/services/UserService.java
	src/main/resources/travels.xml
	src/main/webapp/WEB-INF/includes/navbar.jsp
	src/test/java/ca/ulaval/glo4003/appemployee/services/UserServiceTest.java