edina/fieldtrip-gb#26: adjust gps tracking to the new geojson format
fix merging