Working Copy
Merge branch 'map' of https://github.com/mamogmx/iol.desktop into map