added link to show trip from trip_interface
fixed bug with master merge
fixed merged master conflict