Resolved merge conflict due to renaming of ObjectTypeEnum to ObjectType

scenarios/ArMemObjectMemory/config/ObjectMemory.cfg

source/RobotAPI/components/SkillObserver/SkillObserver.h

...API/components/armem/server/ObjectMemory/ObjectMemory.cpp

source/RobotAPI/interface/armem/query.ice

source/RobotAPI/interface/objectpose/object_pose_types.ice

source/RobotAPI/libraries/ArmarXObjects/ObjectPose.cpp

source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h

source/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml

...tAPI/libraries/ArmarXObjects/aron_conversions/objpose.cpp

...botAPI/libraries/ArmarXObjects/aron_conversions/objpose.h

...s/DMPController/NJointTaskSpaceImpedanceDMPController.cpp

source/RobotAPI/libraries/armem/CMakeLists.txt

source/RobotAPI/libraries/armem/client/Query.h

source/RobotAPI/libraries/armem/client/query/Builder.cpp

source/RobotAPI/libraries/armem/client/query/Builder.h

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

source/RobotAPI/libraries/armem/client/query/selectors.cpp

source/RobotAPI/libraries/armem/client/query/selectors.h

.../RobotAPI/libraries/armem/core/diskmemory/CoreSegment.cpp

source/RobotAPI/libraries/armem/core/diskmemory/Entity.cpp