Fixed merge

...er_configuration/config/joint_trajectory_controllers.yaml

...onfiguration/launch/full_body_position_controllers.launch

...ler_configuration/launch/legs_position_controllers.launch

...nfiguration/launch/upper_body_position_controllers.launch

talos_description/meshes/gripper/gripper_motor_double.STL

...ription/meshes/gripper/gripper_motor_double_collision.STL

talos_description/meshes/gripper/gripper_motor_single.STL

...ription/meshes/gripper/gripper_motor_single_collision.STL

talos_description/meshes/gripper/inner_single.STL

talos_description/meshes/gripper/inner_single_collision.STL

talos_description/meshes/torso/torso_1.STL

talos_description/robots/talos_arm.urdf.xacro

talos_description/robots/talos_full.urdf.xacro

talos_description/robots/talos_gripper.urdf.xacro

talos_description/robots/talos_head.urdf.xacro

talos_description/robots/talos_lower_body.urdf.xacro

talos_description/robots/talos_lower_body_v1.urdf.xacro

talos_description/robots/talos_lower_body_v2.urdf.xacro

talos_description/robots/talos_torso.urdf.xacro

talos_description/robots/upload_gripper.launch