Fix merge conflicts (#99)

* Merging dev branch into main (#78)

* Reverting params.yaml and updating code in server_endpoint.md
* TcpServer class was renamed
* convert all files with dos2unix (#76)
* Minor tutorial tweaks, update version numbers

Co-authored-by: Devin Miller <devin.miller@unity3d.com>
Co-authored-by: peifeng-unity <56408141+peifeng-unity@users.noreply.github.com>

* Updating instructions for URDF repository  (#71)

* 1. Adding images for URDF tutorial 2. Adding instructions highlighting Disable Collison tag

* Adding link to example of disable collision tag in the niryo_one URDF file

Co-authored-by: Devin Miller <devin.miller@unity3d.com>
Co-authored-by: peifeng-unity <56408141+peifeng-unity@users.noreply.github.com>
Co-authored-by: vidurvij-Unity <60901103+vidurvij-Unity@users.noreply.github.com>

Author: 4 people

tutorials/pick_and_place/ROS/src/niryo_moveit/scripts/server_endpoint.py

@@ -18,7 +18,7 @@ COPY docker/tutorial /
 
 RUN /bin/bash -c "find $ROS_WORKSPACE -type f -print0 | xargs -0 dos2unix"
 
-RUN dos2unix /tutorial /setup.sh && chmod +x /setup.sh && /setup.sh && rm /setup.sh
+RUN dos2unix /tutorial && dos2unix /setup.sh && chmod +x /setup.sh && /setup.sh && rm /setup.sh
 
 WORKDIR $ROS_WORKSPACE