Set comments on methods.
Bugfix: map shows the right overlays depending on the navigation mode (cherry picked from commit 2494e55)
Bugfix: Add VIRTUAL and DEFAULT to MapObject.ObjectType
to prevent null pointer for MapObject.getType() (cherry picked from commit 0ed78f0)
Bugfix: set receiverRegistered variable to unregister and register services properly
Merge remote-tracking branch 'origin/master'