refactoring
Merge branch 'develop' of github.com:it3s/mootiro-maps into develop
building
minor fix