Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/controller/IndividualTripController.java
Basic chat, posting does not work yet
working post of chat message
Chat working
TODO
 chatService.createChatRepository(Long id) ...
Added @ResponseBody annotation (otherwise spring is confused)
Fixed broken unittests...

Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/controller/IndividualTripController.java
	src/main/resources/messages/messages_nl.properties
	src/test/java/be/kdg/test/service/ParticipantServiceImplTest.java
Fixed broken unittests...