Maps: Various improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/modules/map-parser.src.js
	studies/map-from-svg.htm