Merge branch 'json' of https://github.com/gogbajbobo/geotracker into json