Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI into aron/dev

# Conflicts:
#	source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
#	source/RobotAPI/libraries/aron/core/CMakeLists.txt

source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp

 #include "MappingDataReader.h"
 
+// STD / STL
 #include <cstring>
 #include <vector>
 #include <algorithm>
@@ -9,36 +10,39 @@
 #include <type_traits>
 #include <utility>
 
+// ICE
 #include <IceUtil/Time.h>
 #include <IceUtil/Handle.h>
 
+// Simox
 #include <SimoxUtility/algorithm/get_map_keys_values.h>
 
+// ArmarXCore
 #include <ArmarXCore/core/logging/Logging.h>
 #include <ArmarXCore/core/logging/LogSender.h>
 #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
 
-#include <RobotAPI/interface/armem/server/ReadingMemoryInterface.h>
+// RobotAPI Interfaces
 #include <RobotAPI/interface/units/LaserScannerUnit.h>
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/server/ReadingMemoryInterface.h>
+
+// RobotAPI Aron
 #include <RobotAPI/libraries/aron/core/Exception.h>
 #include <RobotAPI/libraries/aron/core/navigator/data/complex/NDArray.h>
 
+// RobotAPI Armem
 #include <RobotAPI/libraries/armem/client/Query.h>
 #include <RobotAPI/libraries/armem/client/Reader.h>
 #include <RobotAPI/libraries/armem/client/query/Builder.h>
 #include <RobotAPI/libraries/armem/client/query/selectors.h>
 
-#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
 #include <RobotAPI/libraries/armem/core/workingmemory/Memory.h>
 #include <RobotAPI/libraries/armem/core/workingmemory/CoreSegment.h>
 #include <RobotAPI/libraries/armem/core/workingmemory/Entity.h>
 #include <RobotAPI/libraries/armem/core/workingmemory/ProviderSegment.h>
+#include <RobotAPI/libraries/armem/core/workingmemory/Entity.h>
 #include <RobotAPI/libraries/armem/core/workingmemory/EntityInstance.h>
-#include <RobotAPI/libraries/aron/core/Exception.h>
-#include <RobotAPI/libraries/aron/core/navigator/data/complex/NDArray.h>
-#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
-#include <RobotAPI/interface/armem/server/ReadingMemoryInterface.h>
-#include <RobotAPI/interface/units/LaserScannerUnit.h>
 
 #include <RobotAPI/libraries/armem/util/util.h>
 #include <RobotAPI/libraries/armem_robot_localization/MemoryConnector.h>
@@ -46,7 +50,6 @@
 #include <RobotAPI/libraries/armem_robot_mapping/aron_conversions.h>
 #include <RobotAPI/libraries/armem_robot_mapping/types.h>
 
-
 namespace armarx::armem
 {
 

source/RobotAPI/libraries/aron/core/CMakeLists.txt

@@ -20,7 +20,6 @@ set(LIBS
     cppgen
     Simox::SimoxUtility
 
-    #${Simox_LIBS}
     # System libraries
     Eigen3::Eigen
     # PCLInterface