Merge branch 'feature/fix-ngroute' into develop
Merge branch 'master' into develop
Fixed Map display
Merge pull request #22 from ltfschoen/feature/clean

Feature/clean