Merge branch 'dev' into features/map
Merge branch 'dev' into features/map
Merge pull request #30 from simbiotica/features/styles

Features/styles
Merge branch 'features/map' into dev
new functionality, menu fixed id:70922918