properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/controller/IndividualTripController.java
	src/main/java/be/kdg/service/ParticipantServiceImpl.java
	src/main/resources/messages/messages_nl.properties