Merge two or more trips into one.
Merge branch 'feature/aj/mergetrips' into develop