Merge branch 'master' into 'master'

Changed location.js to resolve issue ILUG-D overlaps NDBUG in the map.

Changed location.js to resolve issue .

See merge request !4
Status Job ID Name Coverage
  Deploy
failed #27
pages

 
Deploy pages
No job trace