added a couple of authorization details
fixed merge conflicts
touched up many features. Implemented copying of another user's trip
fixed merge conflicts