create trip with labels, case-insensitive Labels, UI updates and general bug fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/messages/messages.properties