arno
Merge remote-tracking branch 'origin/master'
arno
arno
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/controller/TripController.java
	src/main/java/be/kdg/listener/SpringApplicationListener.java
	src/main/java/be/kdg/model/Participant.java
	src/main/java/be/kdg/model/Trip.java
	src/main/java/be/kdg/repository/ParticipantRepository.java
	src/main/java/be/kdg/service/MemberService.java
	src/main/java/be/kdg/service/MemberServiceImpl.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
	src/main/resources/messages/messages.properties
	src/main/resources/messages/messages_nl.properties
	src/test/java/be/kdg/test/service/ParticipantServiceImplTest.java
	web/WEB-INF/views/create_trip.jsp
	web/WEB-INF/views/masterpage_header.jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/controller/TripController.java
	src/main/java/be/kdg/listener/SpringApplicationListener.java
	src/main/java/be/kdg/model/Participant.java
	src/main/java/be/kdg/model/Trip.java
	src/main/java/be/kdg/repository/ParticipantRepository.java
	src/main/java/be/kdg/service/MemberService.java
	src/main/java/be/kdg/service/MemberServiceImpl.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
	src/main/resources/messages/messages.properties
	src/main/resources/messages/messages_nl.properties
	src/test/java/be/kdg/test/service/ParticipantServiceImplTest.java
	web/WEB-INF/views/create_trip.jsp
	web/WEB-INF/views/masterpage_header.jsp