Updated trip, album, attachment views
Merged trip.rb conflicts