Merge branch 'master' of github:/ushakov/mapsoft

Conflicts:
	viewer/actions/srtm_area.h