Removed GeoLocation from comments
Merge pull request #379 from pachalad/master

Removed GeoLocation from comments
fixed merge conflict