properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/controller/MemberController.java
	src/main/java/be/kdg/service/MemberServiceImpl.java
properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/repository/TripRepository.java
	src/main/java/be/kdg/service/MemberService.java
	src/main/java/be/kdg/service/ParticipantService.java
	src/main/java/be/kdg/service/ParticipantServiceImpl.java
	src/main/java/be/kdg/service/TripService.java
	src/main/java/be/kdg/service/TripServiceImpl.java
Password
Merge remote-tracking branch 'origin/master'