added NextStateOr
updated configuration tree and service definition creation
updated tests with a next state OR
fixed var name and service reference
fixed tests :D
Merge pull request #3 from lexik/step_or

Allow to defined OR next state