test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/messages_nl.properties
test
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/jsp/trip.jsp
test