Merge branch 'armem/dev' into 'master'

.../armarx/navigation/algorithms/astar/NavigationCostMap.cpp

source/armarx/navigation/client/NavigationStackConfig.cpp

source/armarx/navigation/client/NavigationStackConfig.h

source/armarx/navigation/client/ice/NavigatorInterface.ice

...vigation/components/NavigationMemory/NavigationMemory.cpp

source/armarx/navigation/components/Navigator/Navigator.cpp

source/armarx/navigation/components/Navigator/Navigator.h

source/armarx/navigation/core/CMakeLists.txt

source/armarx/navigation/core/Graph.cpp

source/armarx/navigation/core/Graph.h

source/armarx/navigation/core/json_conversions.cpp

source/armarx/navigation/core/json_conversions.h

source/armarx/navigation/factories/GlobalPlannerFactory.cpp

source/armarx/navigation/factories/GlobalPlannerFactory.h

source/armarx/navigation/factories/LocalPlannerFactory.cpp

source/armarx/navigation/factories/LocalPlannerFactory.h

...ce/armarx/navigation/factories/NavigationStackFactory.cpp

source/armarx/navigation/factories/NavigationStackFactory.h

...e/armarx/navigation/factories/SafetyControllerFactory.cpp

source/armarx/navigation/factories/SafetyControllerFactory.h