Modified ROS to use the new jsoncpp library
Modified ROS to support new hardware step format
Manual merge
Manual merge (again)