geoloc is working properly
Merge branch 'master' into dispatcher