Merge 'geolocation' into 'master'

The geolocation feature is completed, along with a bunch of bugfixes. Please merge these in.