Fixed merge conflict
Merge branch 'lizard5-demo' of github.com:lizardsystem/lizard-map into lizard5-demo