Merge with changes 2tata made

[adlerweb]

2tata modified this code and submitted a PR to the main repo. If it is accepted we should change to upstream, otherwise merge his changes fixing several ugly hacks

[2tata]

Hi,

On 12/04/17 10:37, Florian Knodt wrote: [2tata ](https://github.com/2tata) modified this code and submitted a [PR](freifunk-gluon/gluon#1211) to the main repo. If it is accepted we should change to upstream, otherwise merge [his changes](https://github.com/2tata/gluon/tree/gluon-config-mode-geo-location) fixing several ugly hacks

Yes my intention is to force good ideas into gluon, to increase the accessibility :) I already created an MR to your repo #4, but my MR to gluon includes also an autolocation function. cheers Tarek