commit
fix conflicts with master branch ci
Merge pull request #23 from vovka/feature/LVOUI-23_Map

Feature/lvoui 23 map