Geolocation
Merge branch 'geolocate' into gh-pages