Added edit form for Trip.
Merge origin/master