New WorldMap
Merge branch 'develop' into misc/map-engine-review

Conflicts:
	source/db/worldmap.cpp
	source/db/worldmap.h