changes before trajectory controller
Merge branch 'adjutant' of github.com:kguerin2/ros_controllers into adjutant