Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice

...s/DMPController/NJointTaskSpaceImpedanceDMPController.cpp

...ers/DMPController/NJointTaskSpaceImpedanceDMPController.h

...ce/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp

...ies/armem/server/query_proc/base/BaseQueryProcessorBase.h

...s/armem/server/query_proc/base/MemoryQueryProcessorBase.h

...s/armem/server/query_proc/diskmemory/BaseQueryProcessor.h

.../server/query_proc/diskmemory/CoreSegmentQueryProcessor.h

...armem/server/query_proc/diskmemory/MemoryQueryProcessor.h

...ver/query_proc/diskmemory/ProviderSegmentQueryProcessor.h

...mem/server/query_proc/longtermmemory/BaseQueryProcessor.h

...ver/query_proc/longtermmemory/CoreSegmentQueryProcessor.h

...m/server/query_proc/longtermmemory/MemoryQueryProcessor.h

...query_proc/longtermmemory/ProviderSegmentQueryProcessor.h

...rmem/server/query_proc/workingmemory/BaseQueryProcessor.h

...er/query_proc/workingmemory/CoreSegmentQueryProcessor.cpp

.../server/query_proc/workingmemory/EntityQueryProcessor.cpp

.../server/query_proc/workingmemory/MemoryQueryProcessor.cpp

...uery_proc/workingmemory/ProviderSegmentQueryProcessor.cpp

source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp