Commit pending changes to Data extract tools prior to a much needed
tidy-up
Add Update Map and prevent multiple points being created in the same
place in one river guide (ensure uniqueness of GR per article)
Merge remote-tracking branch 'origin/master'
Code tidy-up