add files un followed by the last merge
corrections in the Bpmn2Cif (forgotten resource set up)
Merge branch 'master' into cif2pnml
forgotten file
Merge branch 'master' into cif2pnml