Merge remote-tracking branch 'origin/dev' into feature/teb_config_as_json

...igation/controller_config/PlatformTrajectory/default.json

source/armarx/navigation/core/CMakeLists.txt

source/armarx/navigation/core/Trajectory.cpp

source/armarx/navigation/core/Trajectory.h

source/armarx/navigation/core/basic_types.cpp

source/armarx/navigation/core/basic_types.h

source/armarx/navigation/core/types.cpp

source/armarx/navigation/core/types.h

...ce/armarx/navigation/local_planning/TimedElasticBands.cpp

source/armarx/navigation/local_planning/TimedElasticBands.h

...rajectory_control/local/TrajectoryFollowingController.cpp