Merge branch 'dev-flo' into develop

catkin_ws/src/learn_environment/converter/waypoints.py

...n_ws/src/learn_environment/developer_docs/define_tasks.md

...aluation_scripts/beginner/exercise_4/exercise_4_2_eval.py

...aluation_scripts/beginner/exercise_6/exercise_6_1_eval.py

...ts/controller/controller_task/activate_controller_eval.py

...ts/controller/controller_task/position_controller_eval.py

...cripts/controller/controller_task/stop_controller_eval.py

...ripts/controller/controller_task/trajectory_controller.py

...tion_scripts/intermediate/exercise_1/exercise_1_1_eval.py

...n_scripts/move_it/move_it_basics/move_it_basics_3_eval.py

...n_scripts/move_it/move_it_basics/move_it_basics_4_eval.py

...ve_it/move_it_intermediate/move_it_intermediate_eval_1.py

...scripts/move_it/move_it_objects/move_it_objects_1_eval.py

...scripts/move_it/move_it_objects/move_it_objects_2_eval.py

...scripts/move_it/move_it_objects/move_it_objects_3_eval.py

catkin_ws/src/learn_environment/task_pool/reset_robot.py

...ipts/controller/controller_task/activate_controller.ipynb

...ipts/controller/controller_task/position_controller.ipynb

..._scripts/controller/controller_task/stop_controller.ipynb

...ts/controller/controller_task/trajectory_controller.ipynb