DDBNEXT-1035: Map
DDBNEXT-1035: Map
DDBNEXT-1035: Map
DDBNEXT-1035: Map
DDBNEXT-1035: Map
DDBNEXT-1035: Map
Merge branch 'DDBNEXT-1035-hla-map4' into develop

Conflicts:
	web-app/js/map/map.js