reinstate merge-all-tracks
update cheat sheet to reflect new phrasing
no changes, layout only
reinstate ability to merge track segments within their parent track
Merge pull request #784 from debrief/issue756_merge

Re-instate legacy track segment merging
Merge branch 'master' into issue575_freq