Merge branch 'feature/end-effector-trajectories' of...

Merge branch 'feature/end-effector-trajectories' of git.h2t.iar.kit.edu:sw/armarx/robot-api into feature/end-effector-trajectories