Merge remote-tracking branch 'origin/master' into 42-add-grasp-affordance-memory

...RobotAPI/libraries/DSControllers/DSJointCarryController.h

...RobotAPI/libraries/DSControllers/DSRTBimanualController.h

source/RobotAPI/libraries/DSControllers/DSRTController.h

...ies/RobotAPIComponentPlugins/HeartbeatComponentPlugin.cpp

...s/DMPController/NJointTaskSpaceImpedanceDMPController.cpp

...ers/DMPController/NJointTaskSpaceImpedanceDMPController.h

source/RobotAPI/libraries/armem/CMakeLists.txt

...API/libraries/armem/client/query/detail/NameSelectorOps.h

...obotAPI/libraries/armem/client/query/detail/SelectorOps.h

...e/RobotAPI/libraries/armem/client/util/SimpleReaderBase.h

source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h

source/RobotAPI/libraries/armem/core/base/EntityBase.h

source/RobotAPI/libraries/armem/core/base/MemoryBase.h

.../RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h

source/RobotAPI/libraries/armem/core/error/ArMemError.cpp

source/RobotAPI/libraries/armem/core/error/ArMemError.h

source/RobotAPI/libraries/armem/mns/MemoryNameSystem.cpp

source/RobotAPI/libraries/armem/mns/MemoryNameSystem.h

source/RobotAPI/libraries/armem/mns/Registry.h

...obotAPI/libraries/armem/server/ltm/LongtermMemoryBase.cpp