Show a simple map when editing a waterpoint
Add fixme
Merge remote-tracking branch 'origin/workshop-aug' into workshop-aug