messages properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	Trips/web/src/main/resources/messages_en.properties