Markers and Icons
Merge remote-tracking branch 'origin/dev.dms' into dev.gab

Conflicts:
	www/index.html