Merge branch 'indigo_dev' of github.com:ipa320/ros_canopen into hydro_dev
load trajectory controller by default
add 2dof test rig urdf
fix 2dof gazebo sim
merge with fmw