Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api

source/RobotAPI/statecharts/operations/RobotControl.cpp

@@ -142,7 +142,7 @@ namespace armarx
         addTransition<EvLoadScenario>(stateRobotInitialized, stateScenarioRunning,
                                       PM::createMapping()->mapFromEvent("*","*"));
         addTransition<EvInit>(stateScenarioRunning, stateRobotPreInitialized);
-        addTransition<Success>(stateScenarioRunning, stateRobotPreInitialized);
+        addTransition<Success>(stateScenarioRunning, stateRobotInitialized);
 
         // failure transitions
         addTransition<EvLoadingFailed>(stateScenarioRunning, stateFatalError);