Merge branch 'dev' of github.com:ErshKUS/OpenStreetMap.ru into dev