Merge remote-tracking branch 'origin/master' into fix/urdf-collision-models

SimoxUtility/json/eigen_conversion.cpp

VirtualRobot/CMakeLists.txt

VirtualRobot/IK/CompositeDiffIK/CompositeDiffIK.cpp

VirtualRobot/IK/CompositeDiffIK/CompositeDiffIK.h

VirtualRobot/IK/DifferentialIK.cpp

VirtualRobot/Nodes/FourBar/Joint.cpp

VirtualRobot/Nodes/FourBar/Joint.h

VirtualRobot/Nodes/RobotNode.cpp

VirtualRobot/Nodes/RobotNode.h

VirtualRobot/Nodes/RobotNodeFourBar.cpp

VirtualRobot/Nodes/RobotNodeFourBar.h

VirtualRobot/Nodes/RobotNodeFourBarFactory.cpp

VirtualRobot/Nodes/RobotNodeFourBarFactory.h

VirtualRobot/Nodes/RobotNodeHemisphere.h

VirtualRobot/Robot.cpp

VirtualRobot/XML/RobotIO.cpp

python/four_bar_mechanism/equations.ipynb

python/four_bar_mechanism/equations.py