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