fixed trajectory action server to better handle trajectories from MoveIt
Merge branch 'master' of http://github.com/roadnarrows-robotics/hekateros
Merge branch 'master' of http://github.com/roadnarrows-robotics/hekateros
Merge branch 'master' of http://github.com/roadnarrows-robotics/hekateros
Merge branch 'master' of http://github.com/roadnarrows-robotics/hekateros
fix merge prob