Merge branch 'testing' into 'master'

Handled the timeout and watchdog internally.

See merge request !4

include/iri_ros_tools/module_action.h

@@ -869,11 +869,16 @@ bool CModuleAction<action_ros,dyn_reconf_config>::is_finished(void)
   
   if(this->enabled)
   {
+    if(this->is_timeout_active() || this->is_watchdog_active())
+      this->cancel();
     action_state=action_client->getState();
     if(action_state==actionlib::SimpleClientGoalState::ACTIVE || action_state==actionlib::SimpleClientGoalState::PENDING)
       return false;
     else
+    {
+      this->stop_timeout();
       return true;
+    }
   }
   else 
     return true;