Geo data
Merge branch 'feature-geodata' into develop
Merge branch 'develop' of https://github.com/wikia-gregor/pret into develop