Trip (template) list.jsp
--> own trips + public trips
Merge remote-tracking branch 'origin/master'