Trip edit features
Merge branch 'master2' into edit
Events comparator