geolocation service implementation
Merge remote-tracking branch 'upstream/master'
merge with upstream
Merge pull request #3 from bbaloo/master

gelocation service implementation