merge commit
Merge branch 'master' of github.com:cmsromadaq/H4DAQ
implementing the fsm