add files un followed by the last merge
corrections in the Bpmn2Cif (forgotten resource set up)
forgotten file