small improvements
Merge branch 'master' of github.com:schlubbi/IMI-Maps
add favorites
resolve merge-conflicts