developing "add trips"
Merge remote-tracking branch 'origin/develop' into develop
minor changes
minor changes
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/webapp/jsp/templates/navigation.jsp