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
increment versions, where they haven't already been incremented since last release
introduce missing POM files
increment the product-level metadata
Merge pull request #785 from debrief/20141003_release

20141003 release
Issue #708 - Timer should start from the beginning if user changes the period