Merge branch 'master' into flatten-robot-before-simulation

# Conflicts:
#	source/ArmarXSimulation/components/Simulator/SimulatedWorld.cpp

source/ArmarXSimulation/components/SimulationObjectPoseProvider/SimulationObjectPoseProvider.cpp

@@ -218,6 +218,9 @@ namespace armarx
                 continue;
             }
 
+            ARMARX_DEBUG << deactivateSpam(10) << "Received " << sceneData.objects.size()
+                         << " objects and " << sceneData.robots.size() << " robots.";
+
             std::vector<objpose::ProvidedObjectPose> providedObjects;
 
             if (properties.requestAllEntities)
@@ -236,8 +239,8 @@ namespace armarx
             // Report the poses
             try
             {
-                ARMARX_IMPORTANT << deactivateSpam(5) << "reporting " << providedObjects.size()
-                                 << " object poses";
+                ARMARX_DEBUG << deactivateSpam(10) << "Reporting " << providedObjects.size()
+                             << " object poses";
                 objectPoseTopic->reportObjectPoses(getName(), objpose::toIce(providedObjects));
             }
             catch (const Ice::LocalException& e)