Merge branch '384-location-editor-and-display' into 'master'

Resolve "Location editor and display"

Closes #384

See merge request !309
4 jobs for 400-permissions-buttons-aren-t-working in 5 minutes and 35 seconds (queued for 1 second)
Status Name Job ID Coverage
  Package
passed package the branch #21303

00:05:17

 
  Dockerize
manual deploy for review #21305
allowed to fail manual
passed dockerize the branch #21304

00:00:17

manual remove review instance #21306
allowed to fail manual