Merge branch 'master' into debug/fixing_colli_avo_control_crashing

armarx_control/robots/common.py

armarx_control/run/adaptRecordingJSTrajectories.py

armarx_control/run/kinesthetic_teaching.py

armarx_control/run/ts_mp_imp_forward_backward_with_traj.py

armarx_control/utils/mirror_trajectory.py

armarx_memory/aron/conversion/ndarray/common.py

armarx_robots/armar_6.py

armarx_robots/armar_7.py

armarx_robots/basic_robot.py

armarx_skills/manager/skill_manager.py