Merge into the new project (org.correttouml.*) the modifications we did until now