kind of rebase
Merge branch 'master' of https://github.com/DmIvanov/MapApp