Merge branch 'release-4' - nakarte - Source code of https://map.sikmir.ru (fork)

commit 3e291dac87ece10b2bcbdf73bc12a863609d067e
parent 8a39fec8dd63058e97eda652fd095ad36a588ee2
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Sun,  5 Aug 2018 18:51:14 +0300

Merge branch 'release-4'

	nakarte Source code of https://map.sikmir.ru (fork)
	git clone git://git.sikmir.ru/nakarte
	Log \| Files \| Refs \| LICENSE