edit Trip
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/main/resources/messages_nl.properties
merge..