Correct map intersection/overlay issue.
Merge branch 'develop' of ssh://illarion.org:1010/maps into develop

Conflicts:
	Dungeons/Chergas_Underworld/ChergasUnderworld.annot.txt
	Dungeons/Chergas_Underworld/ChergasUnderworld.warps.txt
	Dungeons/Chergas_Underworld/ChergasUnderworld_-98.annot.txt
	Dungeons/Chergas_Underworld/ChergasUnderworld_-98.warps.txt
	Dungeons/Underground_Lake_of_Life/LakeofLife_-2.annot.txt
	Dungeons/Underground_Lake_of_Life/LakeofLife_-2.warps.txt
	Dungeons/Underground_Lake_of_Life/LakeofLife_-3.annot.txt
	Dungeons/Underground_Lake_of_Life/LakeofLife_-3.warps.txt
	Dungeons/Underground_Lake_of_Life/LakeofLife_-8.annot.txt
	Dungeons/Underground_Lake_of_Life/LakeofLife_-8.warps.txt
	Dungeons/Underground_Lake_of_Life/LakeofLife_-9.annot.txt
	Dungeons/Underground_Lake_of_Life/LakeofLife_-9.warps.txt