Finish Trip update and edit
Merge branch 'master' of https://github.com/pocus/mondiale