Merge branch 'master', remote-tracking branch 'upstream/master'
cobweb-eu/fieldtrip-cobweb#3: introduce the new geojson format in the sync plugin
Merge branch 'master', remote-tracking branch 'upstream/master'
Merge pull request #9 from cobweb-eu/master

edina