Added geojson and leaflet maps maybe
Fixed merge conflicts
Merge branch 'master' of github:statX/sw-property