bug fix on join trip
Merge branch 'master' of https://github.com/hugoleandersson/TravelMatch