Merge branch 'feature-geomap' of https://github.com/jolevesq/wet-boew into feature-geomap

 branch.
Merging with latest.

i
Merge branch 'feature-geomap' of https://github.com/jvanulde/wet-boew into feature-geomap