merge
Merge branch 'dev' of https://github.com/mueees/maps into dev
add style