bug fix
bug fix
menu OK
bug fix
bug fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/journey/service/JourneyService.java
	target/classes/Main.class
	target/classes/common/dataAccess/Dao.class
	target/classes/common/rest/Rest.class
	target/classes/journey/Journey.class
	target/classes/journey/dto/SearchJourneyRequestDTO.class
	target/classes/journey/dto/SearchJourneyResponseDTO.class
	target/classes/journey/service/JourneyService.class
	target/classes/travel/Travel.class
	target/classes/user/dataAccess/DaoUser.class
	target/classes/user/dto/CreateUserResponseDTO.class
	target/classes/user/dto/LoginResponseDTO.class
	target/classes/user/service/UserService.class
	web/common/translation/translation_en.json
	web/common/translation/translation_fr.json