fix
Merge branch 'electric' of github.com:RCPRG-ros-pkg/orocos_controllers into electric

Conflicts:
	oro_joint_trajectory_action/src/JointTrajectoryAction.cpp
Use xeno_time now().