geolocation self and otheruser locations + tripwaypoints
Merge remote-tracking branch 'origin/master'