Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/messages/messages.properties
	web/WEB-INF/views/trip/overview.jsp