added actuator options 1st, 2nd, 3rd order dynamics
added actuator options
trying to sort the merge conflict