some changes in upcomingtrips
Merge branch 'master' of https://github.com/volterr/FavorTripPals