itinerary items are now sorted by activity time
remove vendor if statement from trip show
current_trip method now checks for nil current_trip_id
Merge pull request #72 from tuxedio/f-itinerary

itinerary items are now sorted by activity time
Merge branch 'development' into f-cart
Merge branch 'f-cart' of https://github.com/tuxedio/tuxedo-proto into f-cart
Fix current trip bug and update current_trip on itinerary item add
Fix scroll bug on cart
Fix trip name bug if no trip is available