Merge branch 'master' into armem/dev

scenarios/ArMemCore/config/DebugObserver.instance1.cfg

scenarios/ArMemExample/config/ExampleMemory.cfg

scenarios/ArMemMP/ArMemMP.scx

scenarios/ArMemMP/config/DebugObserver.cfg

scenarios/ArMemMP/config/MPMemory.cfg

scenarios/ArMemMP/config/RemoteGuiProviderApp.cfg

scenarios/ArMemMP/config/global.cfg

...otAPI/components/armem/server/MotionMemory/CMakeLists.txt

...API/components/armem/server/MotionMemory/MotionMemory.cpp

...otAPI/components/armem/server/MotionMemory/MotionMemory.h

source/RobotAPI/libraries/CMakeLists.txt

...RobotAPI/libraries/DMPController/TaskSpaceDMPController.h

source/RobotAPI/libraries/armem_mps/CMakeLists.txt

source/RobotAPI/libraries/armem_mps/StatechartListener.cpp

source/RobotAPI/libraries/armem_mps/StatechartListener.h

...obotAPI/libraries/armem_mps/aron/JointSpaceTrajectory.xml

...RobotAPI/libraries/armem_mps/aron/TaskSpaceTrajectory.xml

source/RobotAPI/libraries/armem_mps/aron/Trajectory.xml

source/RobotAPI/libraries/armem_mps/aron/Trajectory_old.xml

...raries/armem_mps/aron/Trajectory_old_didworkpartially.xml