Merge branch 'develop' of ssh://illarion.org:1010/maps into develop
Merge branch 'develop' of https://github.com/LaFamiglia/Illarion-Map into develop