Geolocation merged. Javascript bugs are fixed.
Merge pull request #344 from ArturG/master

PR merging. JS bugs fix.