diff --git a/doc/src/technical/uml-analysis.xmi b/doc/src/technical/uml-analysis.xmi
index 69c5a6e10..4d7bae874 100644
--- a/doc/src/technical/uml-analysis.xmi
+++ b/doc/src/technical/uml-analysis.xmi
@@ -1,1934 +1,1788 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMI verified="false" xmi.version="1.2" timestamp="2009-11-09T08:58:29" xmlns:UML="http://schema.omg.org/spec/UML/1.3" >
+<XMI verified="false" xmi.version="1.2" timestamp="2009-11-09T18:02:26" xmlns:UML="http://schema.omg.org/spec/UML/1.3" >
  <XMI.header>
   <XMI.documentation>
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
    <XMI.exporterVersion>1.5.8</XMI.exporterVersion>
    <XMI.exporterEncoding>UnicodeUTF8</XMI.exporterEncoding>
   </XMI.documentation>
-  <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
+  <XMI.metamodel xmi.version="1.3" href="UML.xml" xmi.name="UML" />
  </XMI.header>
  <XMI.content>
-  <UML:Model isSpecification="false" isLeaf="false" isRoot="false" xmi.id="m1" isAbstract="false" name="UML Model" >
+  <UML:Model isSpecification="false" isAbstract="false" isLeaf="false" xmi.id="m1" isRoot="false" name="UML Model" >
    <UML:Namespace.ownedElement>
-    <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="folder" isRoot="false" isAbstract="false" name="folder" />
-    <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="datatype" isRoot="false" isAbstract="false" name="datatype" />
-    <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="enum" isRoot="false" isAbstract="false" name="enum" />
-    <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="interface" isRoot="false" isAbstract="false" name="interface" />
-    <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="value object" isRoot="false" isAbstract="false" name="value object" />
-    <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="ValueObject" isRoot="false" isAbstract="false" name="ValueObject" />
-    <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="abstract" isRoot="false" isAbstract="false" name="abstract" />
-    <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="&lt;&lt;value object>>" isRoot="false" isAbstract="false" name="&lt;&lt;value object>>" />
-    <UML:Model stereotype="folder" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="Logical View" isRoot="false" isAbstract="false" name="Logical View" >
+    <UML:Stereotype visibility="public" isSpecification="false" namespace="m1" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="folder" name="folder" />
+    <UML:Stereotype visibility="public" isSpecification="false" namespace="m1" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="datatype" name="datatype" />
+    <UML:Stereotype visibility="public" isSpecification="false" namespace="m1" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="enum" name="enum" />
+    <UML:Stereotype visibility="public" isSpecification="false" namespace="m1" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="interface" name="interface" />
+    <UML:Stereotype visibility="public" isSpecification="false" namespace="m1" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="value object" name="value object" />
+    <UML:Stereotype visibility="public" isSpecification="false" namespace="m1" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="ValueObject" name="ValueObject" />
+    <UML:Stereotype visibility="public" isSpecification="false" namespace="m1" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="abstract" name="abstract" />
+    <UML:Stereotype visibility="public" isSpecification="false" namespace="m1" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="&lt;&lt;value object>>" name="&lt;&lt;value object>>" />
+    <UML:Model stereotype="folder" visibility="public" isSpecification="false" namespace="m1" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Logical View" name="Logical View" >
      <UML:Namespace.ownedElement>
-      <UML:Package stereotype="folder" isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="Datatypes" isRoot="false" isAbstract="false" name="Datatypes" >
+      <UML:Package stereotype="folder" visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Datatypes" name="Datatypes" >
        <UML:Namespace.ownedElement>
-        <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="dCHs9h07Z9Vb" isRoot="false" isAbstract="false" name="int" />
-        <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="9Q1g52t0nvdA" isRoot="false" isAbstract="false" name="char" />
-        <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="XB4FshQ7XZoX" isRoot="false" isAbstract="false" name="bool" />
-        <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="eMh8xhh57ijC" isRoot="false" isAbstract="false" name="float" />
-        <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="iaBVWof1xjGn" isRoot="false" isAbstract="false" name="double" />
-        <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="OgvvEhTs18yx" isRoot="false" isAbstract="false" name="short" />
-        <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="pf2uMj54KGao" isRoot="false" isAbstract="false" name="long" />
-        <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="2Fpzx5nLkgFy" isRoot="false" isAbstract="false" name="unsigned int" />
-        <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="NgoNmnKZSKTm" isRoot="false" isAbstract="false" name="unsigned short" />
-        <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="3YrNmRBoeyoZ" isRoot="false" isAbstract="false" name="unsigned long" />
-        <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="2btmF8kaoYxY" isRoot="false" isAbstract="false" name="string" />
-        <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="R5QWtAvg4B4W" isRoot="false" isAbstract="false" name="{directo, calculado}" />
-        <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="nnsHvkdYJhd2" isRoot="false" isAbstract="false" name="{direct, indirect}" />
-        <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="byxyj0hGxJuG" isRoot="false" isAbstract="false" name="undef" >
+        <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="dCHs9h07Z9Vb" name="int" />
+        <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="9Q1g52t0nvdA" name="char" />
+        <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="XB4FshQ7XZoX" name="bool" />
+        <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="eMh8xhh57ijC" name="float" />
+        <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="iaBVWof1xjGn" name="double" />
+        <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="OgvvEhTs18yx" name="short" />
+        <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="pf2uMj54KGao" name="long" />
+        <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="2Fpzx5nLkgFy" name="unsigned int" />
+        <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="NgoNmnKZSKTm" name="unsigned short" />
+        <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="3YrNmRBoeyoZ" name="unsigned long" />
+        <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="2btmF8kaoYxY" name="string" />
+        <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="R5QWtAvg4B4W" name="{directo, calculado}" />
+        <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="nnsHvkdYJhd2" name="{direct, indirect}" />
+        <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="byxyj0hGxJuG" name="undef" >
          <UML:GeneralizableElement.generalization>
           <UML:Generalization xmi.idref="pb6HwGdUgAtX" />
           <UML:Generalization xmi.idref="XMEBU7he2Yo3" />
          </UML:GeneralizableElement.generalization>
         </UML:DataType>
-        <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="4pn7QKvOM46U" isRoot="false" isAbstract="false" name="byte" />
-        <UML:DataType stereotype="datatype" isSpecification="false" isLeaf="false" visibility="public" namespace="Datatypes" xmi.id="6zMANtkSKpsl" isRoot="false" isAbstract="false" name="String" />
+        <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="4pn7QKvOM46U" name="byte" />
+        <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="6zMANtkSKpsl" name="String" />
        </UML:Namespace.ownedElement>
       </UML:Package>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="P0toAiR6U083" isRoot="false" isAbstract="false" name="Order" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="P0toAiR6U083" name="Order" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="B2K2UzfVI9Wi" />
        </UML:GeneralizableElement.generalization>
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="DERIY2D0m258" type="GvUkFUrye1Yl" name="responsible" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="6yIi8sikVITd" type="8pZmq7VPM3mb" name="customer" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="DERIY2D0m258" type="GvUkFUrye1Yl" name="responsible" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="6yIi8sikVITd" type="8pZmq7VPM3mb" name="customer" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="tuIzeslDqJW5" isRoot="false" isAbstract="false" name="OrderElement" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="tuIzeslDqJW5" name="OrderElement" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="yvZ8hSGAoroU" type="2btmF8kaoYxY" name="code" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="jahskrbX6nDB" type="XB4FshQ7XZoX" name="planificable" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="T2N4pvnxTlbr" type="nW53miILv2NX" name="name" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="GQQYTUr7AcSS" type="HMHBOcgbsD7k" name="initDate" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="JDw66k4ZVdOM" type="e9SWKZFg28R5" name="endDate" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="1WSUmtuIKO8P" type="bFNe0zhsM3Ej" name="mandatoryInit" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="Zksz1itItqOx" type="gPUkG7gP5S20" name="mandatoryEnd" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="YQX33vN4QqYC" type="fNiLi0qhO9Dg" name="description" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="yvZ8hSGAoroU" type="2btmF8kaoYxY" name="code" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="jahskrbX6nDB" type="XB4FshQ7XZoX" name="planificable" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="T2N4pvnxTlbr" type="nW53miILv2NX" name="name" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="GQQYTUr7AcSS" type="HMHBOcgbsD7k" name="initDate" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="JDw66k4ZVdOM" type="e9SWKZFg28R5" name="endDate" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="1WSUmtuIKO8P" type="bFNe0zhsM3Ej" name="mandatoryInit" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="Zksz1itItqOx" type="gPUkG7gP5S20" name="mandatoryEnd" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="YQX33vN4QqYC" type="fNiLi0qhO9Dg" name="description" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="9m8Qj7mNVHWt" isRoot="false" isAbstract="false" name="OrderLineGroup" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="9m8Qj7mNVHWt" name="OrderLineGroup" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="th9P9NXUOrdg" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="l4f7vJlc79Qq" isRoot="false" isAbstract="false" name="OrderLine" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="l4f7vJlc79Qq" name="OrderLine" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="C7h2uwZmyT9F" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="aDjWeslUEANx" isRoot="false" isAbstract="false" name="HoursGroup" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="aDjWeslUEANx" name="HoursGroup" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="QVL8zwMkOYp4" />
        </UML:GeneralizableElement.generalization>
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="z1GOD4u2EiWZ" type="3ZV6J5w3YLsH" name="workingHours" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="ktQMAYAYBYn9" type="51uzbFU0KUu9" name="percentage" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="k5PnJ8HsSFwF" type="ECeqpWy8psFU" name="fixedPercentage" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="z1GOD4u2EiWZ" type="3ZV6J5w3YLsH" name="workingHours" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="ktQMAYAYBYn9" type="51uzbFU0KUu9" name="percentage" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="k5PnJ8HsSFwF" type="ECeqpWy8psFU" name="fixedPercentage" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="pXwBgpXvFPTv" isRoot="false" isAbstract="false" name="Criterion" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="Lvk4mriLGL6N" name="requires" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="pXwBgpXvFPTv" name="Criterion" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="Lvk4mriLGL6N" name="requires" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="mnZNIKqUdcat" aggregation="none" type="aDjWeslUEANx" name="" multiplicity="0..*" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="wdCpVDapFcnl" aggregation="none" type="pXwBgpXvFPTv" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" multiplicity="0..*" xmi.id="mnZNIKqUdcat" type="aDjWeslUEANx" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="wdCpVDapFcnl" type="pXwBgpXvFPTv" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="9JJu7hjphMwH" isRoot="false" isAbstract="false" name="TaskElement" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="9JJu7hjphMwH" name="TaskElement" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="ojq9QEw0643e" type="XB4FshQ7XZoX" name="isMilestone" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="7gNBZLWZkZc7" type="aRsr6290OD8w" name="shareOfHours" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="T8uJ0AUIqm9W" type="23vNzz7nvtby" name="name" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="yWZfkemOzwxI" type="iXjikXNn4Hey" name="notes" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="SU1z68fXEXrD" type="bvqHRyC96Wa2" name="startDate" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="fLTV6c046Xjo" type="i11mVbmIp891" name="endDate" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="NMYKUMViYSjv" type="zIPqKcZ2wTbx" name="deadLine" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="ojq9QEw0643e" type="XB4FshQ7XZoX" name="isMilestone" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="7gNBZLWZkZc7" type="aRsr6290OD8w" name="shareOfHours" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="T8uJ0AUIqm9W" type="23vNzz7nvtby" name="name" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="yWZfkemOzwxI" type="iXjikXNn4Hey" name="notes" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="SU1z68fXEXrD" type="bvqHRyC96Wa2" name="startDate" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="fLTV6c046Xjo" type="i11mVbmIp891" name="endDate" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="NMYKUMViYSjv" type="zIPqKcZ2wTbx" name="deadLine" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="8A8KfC0gS3t4" isRoot="false" isAbstract="false" name="TaskGroup" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="8A8KfC0gS3t4" name="TaskGroup" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="ECeqpWy8psFU" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="oRwdH97rBGn9" isRoot="false" isAbstract="false" name="Task" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="oRwdH97rBGn9" name="Task" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="PB91APUzEttp" />
        </UML:GeneralizableElement.generalization>
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="I6hy2jURDKuk" type="dCHs9h07Z9Vb" name="hours" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="wTWPIyvo8AKD" type="SAiaWhgPXIk9" name="calculatedValue" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="iMmGk82o7POp" type="zg1HpXzSx1uP" name="restrictionType" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="3aRp2LuzZTcM" type="wt7gG0veBFYQ" name="retrictionDate" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="I6hy2jURDKuk" type="dCHs9h07Z9Vb" name="hours" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="wTWPIyvo8AKD" type="SAiaWhgPXIk9" name="calculatedValue" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="iMmGk82o7POp" type="zg1HpXzSx1uP" name="restrictionType" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="3aRp2LuzZTcM" type="wt7gG0veBFYQ" name="retrictionDate" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="0fgpKmKdgy1V" name="descompose" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="0fgpKmKdgy1V" name="descompose" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="H6ykckTTLgwX" aggregation="none" type="oRwdH97rBGn9" name="" multiplicity="1..N" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="UIfuocoX7aTF" aggregation="none" type="aDjWeslUEANx" name="" multiplicity="0..*" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" multiplicity="1..N" xmi.id="H6ykckTTLgwX" type="oRwdH97rBGn9" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="0..*" xmi.id="UIfuocoX7aTF" type="aDjWeslUEANx" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="rVN4DbRR2AJv" isRoot="false" isAbstract="false" name="Dependency" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="rVN4DbRR2AJv" name="Dependency" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="v2vy1t1U7tTJ" type="th9P9NXUOrdg" name="type" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="xEgMtUGgLP1d" type="iaBVWof1xjGn" name="percentage" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="UnpmZg9Usnqm" type="dCHs9h07Z9Vb" name="lag" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="v2vy1t1U7tTJ" type="th9P9NXUOrdg" name="type" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="xEgMtUGgLP1d" type="iaBVWof1xjGn" name="percentage" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="UnpmZg9Usnqm" type="dCHs9h07Z9Vb" name="lag" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="589rY4r0tKNw" name="origin" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="589rY4r0tKNw" name="origin" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="I9PcoJ9IboAN" aggregation="none" type="rVN4DbRR2AJv" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="OzsTXJjcRtb9" aggregation="none" type="oRwdH97rBGn9" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="I9PcoJ9IboAN" type="rVN4DbRR2AJv" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="OzsTXJjcRtb9" type="oRwdH97rBGn9" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="sEnjZ8f55002" name="end" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="sEnjZ8f55002" name="end" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="AB5VklR0socg" aggregation="none" type="rVN4DbRR2AJv" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="7jwgV73t6tNb" aggregation="none" type="oRwdH97rBGn9" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="AB5VklR0socg" type="rVN4DbRR2AJv" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="7jwgV73t6tNb" type="oRwdH97rBGn9" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="xC9oqvTbtqno" isRoot="false" isAbstract="false" name="ResourceAllocation" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="xC9oqvTbtqno" name="ResourceAllocation" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="a6V0KD2wJMKX" type="C7h2uwZmyT9F" name="percentage" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="a6V0KD2wJMKX" type="C7h2uwZmyT9F" name="percentage" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="zOVY0BwVHuvE" isRoot="false" isAbstract="false" name="SpecificResourceAllocation" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="zOVY0BwVHuvE" name="SpecificResourceAllocation" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="g8YcVjpn2tyC" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="EuVtTEVBubBT" isRoot="false" isAbstract="false" name="Worker" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="EuVtTEVBubBT" name="Worker" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="ZHijoLFKrOsP" />
        </UML:GeneralizableElement.generalization>
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="96el6MbZplyM" type="QIfzpI6CGxzO" name="firstName" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="MZt6QoVfJHE1" type="th9P9NXUOrdg" name="surname" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="OX9WblHi7qFu" type="zjtlyOUtbbhP" name="nif" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="96el6MbZplyM" type="QIfzpI6CGxzO" name="firstName" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="MZt6QoVfJHE1" type="th9P9NXUOrdg" name="surname" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="OX9WblHi7qFu" type="zjtlyOUtbbhP" name="nif" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="VyGIwPHyTZLs" isRoot="false" isAbstract="false" name="Date" />
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="MJAjMsm0lkhn" isRoot="false" isAbstract="false" name="Progress" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="VyGIwPHyTZLs" name="Date" />
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="MJAjMsm0lkhn" name="Progress" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="JB2CkfbKEgSm" type="6TQ6Ez2FKbOm" name="cantidad" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="JB2CkfbKEgSm" type="6TQ6Ez2FKbOm" name="cantidad" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="Qi0Wq6l4HwkA" isRoot="false" isAbstract="false" name="ProgressType" />
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="whCdzX4JqC3B" isRoot="false" isAbstract="false" name="PercentageProgressType" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Qi0Wq6l4HwkA" name="ProgressType" />
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="whCdzX4JqC3B" name="PercentageProgressType" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="fBOv7853nHek" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="4n9qXqbwYbSM" isRoot="false" isAbstract="false" name="UnitProgressType" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="4n9qXqbwYbSM" name="UnitProgressType" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="8Z1uofebJiDB" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="aaComrF6S2Lu" isRoot="false" isAbstract="false" name="NumberOfUnits" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="aaComrF6S2Lu" name="NumberOfUnits" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="vbfrWGfCLBGl" type="hAf0l1kIOBtM" name="cantidad_que_hacer" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="vbfrWGfCLBGl" type="hAf0l1kIOBtM" name="cantidad_que_hacer" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="UwUp5iYgVB85" isRoot="false" isAbstract="false" name="AdvanceAssigment" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="UwUp5iYgVB85" name="AdvanceAssigment" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="T39teAln6AUS" type="qdTUeCLBaJts" name="reportGlobalAdvance" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="oAXoyRcNetbF" type="2zQEOGZFsPzF" name="maxValue" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="T39teAln6AUS" type="qdTUeCLBaJts" name="reportGlobalAdvance" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="oAXoyRcNetbF" type="2zQEOGZFsPzF" name="maxValue" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="bmRPNtkrYrn4" isRoot="false" isAbstract="false" name="AdvanceType" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="bmRPNtkrYrn4" name="AdvanceType" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="jLQWNEpqIwhw" type="2btmF8kaoYxY" name="unitName" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="7QjDaDdRr4tT" type="BxRhMi93e0js" name="defaultMaxValue" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="JUzbQeVV4Egd" type="qdTUeCLBaJts" name="updatable" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="wdVDSImig8ZS" type="uvVTa3RmuzlY" name="unitPrecision" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="8qqaKRrMYiur" type="u366LeqgoLzY" name="active" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="IlMoxo4jWks4" type="q6mcBRoUvl4K" name="percentage" />
-        <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="RA5JX2Wn1VRs" isRoot="false" isAbstract="false" isQuery="false" name="doPropagateAdvanceToParent" >
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="jLQWNEpqIwhw" type="2btmF8kaoYxY" name="unitName" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="7QjDaDdRr4tT" type="BxRhMi93e0js" name="defaultMaxValue" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="JUzbQeVV4Egd" type="qdTUeCLBaJts" name="updatable" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="wdVDSImig8ZS" type="uvVTa3RmuzlY" name="unitPrecision" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="8qqaKRrMYiur" type="u366LeqgoLzY" name="active" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="IlMoxo4jWks4" type="q6mcBRoUvl4K" name="percentage" />
+        <UML:Operation visibility="public" isSpecification="false" isQuery="false" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="RA5JX2Wn1VRs" name="doPropagateAdvanceToParent" >
          <UML:BehavioralFeature.parameter>
-          <UML:Parameter isSpecification="false" visibility="private" xmi.id="iF0DNF0CgAnz" value="" type="tuIzeslDqJW5" name="order" />
+          <UML:Parameter visibility="private" isSpecification="false" xmi.id="iF0DNF0CgAnz" type="tuIzeslDqJW5" value="" name="order" />
          </UML:BehavioralFeature.parameter>
         </UML:Operation>
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="QX7KUtq8V8Jy" isRoot="false" isAbstract="false" name="AdvanceMeasurement" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="QX7KUtq8V8Jy" name="AdvanceMeasurement" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="K1NCUYwZYOGR" type="VyGIwPHyTZLs" name="date" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="jwriGbh9AsSk" type="BxRhMi93e0js" name="value" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="K1NCUYwZYOGR" type="VyGIwPHyTZLs" name="date" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="jwriGbh9AsSk" type="BxRhMi93e0js" name="value" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="BxRhMi93e0js" isRoot="false" isAbstract="false" name="BigDecimal" />
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="qdTUeCLBaJts" isRoot="false" isAbstract="false" name="boolean" />
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="QJ2FNvib6KPZ" isRoot="false" isAbstract="false" name="PercentageAdvanceType" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="BxRhMi93e0js" name="BigDecimal" />
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="qdTUeCLBaJts" name="boolean" />
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="QJ2FNvib6KPZ" name="PercentageAdvanceType" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="q6mcBRoUvl4K" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="LHL7LiEKnuNC" isRoot="false" isAbstract="false" name="AdditiveAdvanceType" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="LHL7LiEKnuNC" name="AdditiveAdvanceType" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="2zQEOGZFsPzF" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="HFZEFQG7HpZi" isRoot="false" isAbstract="false" name="SpecificResourceAllocationWithDates" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="HFZEFQG7HpZi" name="SpecificResourceAllocationWithDates" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="aRsr6290OD8w" />
         <UML:Generalization xmi.idref="nW53miILv2NX" />
        </UML:GeneralizableElement.generalization>
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="RrIl2flC0jpC" type="VyGIwPHyTZLs" name="delay" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="Db7E4ky5iW8v" type="dCHs9h07Z9Vb" name="duration" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="RrIl2flC0jpC" type="VyGIwPHyTZLs" name="delay" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="Db7E4ky5iW8v" type="dCHs9h07Z9Vb" name="duration" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="o5mCGv6T0zJ1" isRoot="false" isAbstract="false" name="AssigmentFunction" />
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="YpNtsZci2NR9" isRoot="false" isAbstract="false" name="DayAssigment" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="o5mCGv6T0zJ1" name="AssigmentFunction" />
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="YpNtsZci2NR9" name="DayAssigment" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="SEQVgSVQf1jQ" type="dCHs9h07Z9Vb" name="hours" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="NyFsBrpPm7dW" initialValue="{criterion,especifica}" type="ECeqpWy8psFU" name="tipo" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="SEQVgSVQf1jQ" type="dCHs9h07Z9Vb" name="hours" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="NyFsBrpPm7dW" type="ECeqpWy8psFU" initialValue="{criterion,especifica}" name="tipo" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="ip8LnfNpfMJo" isRoot="false" isAbstract="false" name="GenericResourceAllocation" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="ip8LnfNpfMJo" name="GenericResourceAllocation" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="GvUkFUrye1Yl" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="ZM0OVzwqw9j7" isRoot="false" isAbstract="false" name="SpecificaDayAssigment" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="ZM0OVzwqw9j7" name="SpecificaDayAssigment" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="v4p7BokGfDJi" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="0WUme5I6QUAL" isRoot="false" isAbstract="false" name="GenericDayAssigment" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="0WUme5I6QUAL" name="GenericDayAssigment" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="G2AvGRcerKjs" />
         <UML:Generalization xmi.idref="c5awcauVaslZ" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="GpZEcpFG3HuR" isRoot="false" isAbstract="false" name="SpecificDayAssigment" />
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="F56Fpf6oVy2F" isRoot="false" isAbstract="false" name="EspecificDayAssigment" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="GpZEcpFG3HuR" name="SpecificDayAssigment" />
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="F56Fpf6oVy2F" name="EspecificDayAssigment" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="E38AqfH4iLJV" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="J8SsPhfYKZmW" isRoot="false" isAbstract="false" name="Label" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="J8SsPhfYKZmW" name="Label" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="krb6TREqHCXA" type="PB91APUzEttp" name="name" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="krb6TREqHCXA" type="PB91APUzEttp" name="name" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="4cyZLGRuFuQR" isRoot="false" isAbstract="false" name="LabelType" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="4cyZLGRuFuQR" name="LabelType" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="O6eT5AUWOLWC" type="q0K4uDt3Em1T" name="name" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="O6eT5AUWOLWC" type="q0K4uDt3Em1T" name="name" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="o5RjRxAkOrU1" isRoot="false" isAbstract="false" name="DirectAdvanceAssigment" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="o5RjRxAkOrU1" name="DirectAdvanceAssigment" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="t9QzWAWJNjCI" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="KgJE71ZrTa4N" isRoot="false" isAbstract="false" name="IndirectAdvanceAssigment" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="KgJE71ZrTa4N" name="IndirectAdvanceAssigment" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="u0gIjsab6Z3N" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="1DEsmgrxxgMG" name="origin" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="1DEsmgrxxgMG" name="origin" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="bq9NjGU2oLd3" aggregation="none" type="rVN4DbRR2AJv" name="" multiplicity="0..*" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="7JBHDZSD6LSV" aggregation="none" type="9JJu7hjphMwH" name="" multiplicity="1..1" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" multiplicity="0..*" xmi.id="bq9NjGU2oLd3" type="rVN4DbRR2AJv" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1..1" xmi.id="7JBHDZSD6LSV" type="9JJu7hjphMwH" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="F6WCnsRVBR2k" name="destination" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="F6WCnsRVBR2k" name="destination" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="n9OzJqCveJIN" aggregation="none" type="rVN4DbRR2AJv" name="" multiplicity="0..*" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="XnNM6yNBGZRT" aggregation="none" type="9JJu7hjphMwH" name="" multiplicity="1..1" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" multiplicity="0..*" xmi.id="n9OzJqCveJIN" type="rVN4DbRR2AJv" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1..1" xmi.id="XnNM6yNBGZRT" type="9JJu7hjphMwH" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="CzdNEBmDsnGX" isRoot="false" isAbstract="false" name="CriterionRequirement" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="Eddd1PYLJZsj" name="" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="CzdNEBmDsnGX" name="CriterionRequirement" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="Eddd1PYLJZsj" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="s8QWQhsxSFHW" aggregation="none" type="tuIzeslDqJW5" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="EffUE6vIyXV9" aggregation="none" type="CzdNEBmDsnGX" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="s8QWQhsxSFHW" type="tuIzeslDqJW5" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="EffUE6vIyXV9" type="CzdNEBmDsnGX" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="hyk1Xai6poQ6" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="hyk1Xai6poQ6" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="c87oC3J2AiYa" aggregation="none" type="CzdNEBmDsnGX" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="POVrcnLoQ0Gc" aggregation="none" type="CzdNEBmDsnGX" name="parent" multiplicity="0..1" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="c87oC3J2AiYa" type="CzdNEBmDsnGX" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="0..1" xmi.id="POVrcnLoQ0Gc" type="CzdNEBmDsnGX" name="parent" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="PqlFdBLug2Vo" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="PqlFdBLug2Vo" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="59u3gNAGWF4g" aggregation="none" type="aDjWeslUEANx" name="" multiplicity="1" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="JMiR4EzTdUIF" aggregation="none" type="CzdNEBmDsnGX" name="" multiplicity="*" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1" xmi.id="59u3gNAGWF4g" type="aDjWeslUEANx" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="*" xmi.id="JMiR4EzTdUIF" type="CzdNEBmDsnGX" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="WasJ2iNgmUNO" isRoot="false" isAbstract="false" name="DirectCriterionRequirement" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="WasJ2iNgmUNO" name="DirectCriterionRequirement" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="810lqRZuxUkW" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Generalization isSpecification="false" child="WasJ2iNgmUNO" visibility="public" namespace="Logical View" xmi.id="810lqRZuxUkW" parent="CzdNEBmDsnGX" discriminator="" name="" />
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="FlXADIefsqnc" isRoot="false" isAbstract="false" name="IndirectCriterionRequirement" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="WasJ2iNgmUNO" xmi.id="810lqRZuxUkW" parent="CzdNEBmDsnGX" name="" />
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="FlXADIefsqnc" name="IndirectCriterionRequirement" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="2vqmuLYaB12V" />
         <UML:Generalization xmi.idref="3sWbDbUnzm2a" />
        </UML:GeneralizableElement.generalization>
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="m625ALmH9veJ" type="qdTUeCLBaJts" name="valid" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="m625ALmH9veJ" type="qdTUeCLBaJts" name="valid" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Generalization isSpecification="false" child="FlXADIefsqnc" visibility="public" namespace="Logical View" xmi.id="2vqmuLYaB12V" parent="CzdNEBmDsnGX" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="hkpqjrJYfFEH" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="FlXADIefsqnc" xmi.id="2vqmuLYaB12V" parent="CzdNEBmDsnGX" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="hkpqjrJYfFEH" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="gmGHEWUU5V9h" aggregation="none" type="FlXADIefsqnc" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="mPLCb1G8qdCv" aggregation="none" type="CzdNEBmDsnGX" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="gmGHEWUU5V9h" type="FlXADIefsqnc" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="mPLCb1G8qdCv" type="CzdNEBmDsnGX" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="Sz23mT32SUan" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="Sz23mT32SUan" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="1vHkN4Y1omG3" aggregation="composite" type="WasJ2iNgmUNO" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="HkVMFc111NBc" aggregation="none" type="FlXADIefsqnc" name="children" multiplicity="0..*" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="1vHkN4Y1omG3" type="WasJ2iNgmUNO" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="0..*" xmi.id="HkVMFc111NBc" type="FlXADIefsqnc" name="children" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Generalization isSpecification="false" child="FlXADIefsqnc" visibility="public" namespace="Logical View" xmi.id="3sWbDbUnzm2a" parent="CzdNEBmDsnGX" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="f0wclyDapGkh" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="FlXADIefsqnc" xmi.id="3sWbDbUnzm2a" parent="CzdNEBmDsnGX" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="f0wclyDapGkh" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="MRjC3v82qNmB" aggregation="none" type="FlXADIefsqnc" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="QIAE5QFK8kgN" aggregation="none" type="WasJ2iNgmUNO" name="parent" multiplicity="1..1" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="MRjC3v82qNmB" type="FlXADIefsqnc" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1..1" xmi.id="QIAE5QFK8kgN" type="WasJ2iNgmUNO" name="parent" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="QuCpOvJF0Q5L" isRoot="false" isAbstract="false" name="Resource" />
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="BYZCrni1720s" isRoot="false" isAbstract="false" name="Machine" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="QuCpOvJF0Q5L" name="Resource" />
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="BYZCrni1720s" name="Machine" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="SqQIEIhnzr5j" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Generalization isSpecification="false" child="EuVtTEVBubBT" visibility="public" namespace="Logical View" xmi.id="ZHijoLFKrOsP" parent="QuCpOvJF0Q5L" discriminator="" name="" />
-      <UML:Generalization isSpecification="false" child="BYZCrni1720s" visibility="public" namespace="Logical View" xmi.id="SqQIEIhnzr5j" parent="QuCpOvJF0Q5L" discriminator="" name="" />
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="F2fAyFCIedxF" isRoot="false" isAbstract="false" name="CriterionSatisfaction" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="EuVtTEVBubBT" xmi.id="ZHijoLFKrOsP" parent="QuCpOvJF0Q5L" name="" />
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="BYZCrni1720s" xmi.id="SqQIEIhnzr5j" parent="QuCpOvJF0Q5L" name="" />
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="F2fAyFCIedxF" name="CriterionSatisfaction" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="gFV7gE4meQDh" type="g8YcVjpn2tyC" name="start_date" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="3Vq7hrrf08qz" type="cMgl4VNTAnuf" name="end_date" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="gFV7gE4meQDh" type="g8YcVjpn2tyC" name="start_date" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="3Vq7hrrf08qz" type="cMgl4VNTAnuf" name="end_date" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="J8OHoCPSGkOw" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="J8OHoCPSGkOw" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="UKCP0mNZRLyS" aggregation="none" type="YpNtsZci2NR9" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="7Xt8FZGNSgd3" aggregation="none" type="QuCpOvJF0Q5L" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="UKCP0mNZRLyS" type="YpNtsZci2NR9" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="7Xt8FZGNSgd3" type="QuCpOvJF0Q5L" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="Z7WJUTzgGyya" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="Z7WJUTzgGyya" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="nF2ZCNNefZ1d" aggregation="none" type="QuCpOvJF0Q5L" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="JOCjh8Bog3vt" aggregation="none" type="zOVY0BwVHuvE" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="nF2ZCNNefZ1d" type="QuCpOvJF0Q5L" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="JOCjh8Bog3vt" type="zOVY0BwVHuvE" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="pWd0kqSVARYy" isRoot="false" isAbstract="false" name="ResourceCalendar" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="pWd0kqSVARYy" name="ResourceCalendar" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="44THOkEiSaKg" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="QIfzpI6CGxzO" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="QIfzpI6CGxzO" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="SVt73uiMGu5x" aggregation="composite" type="P0toAiR6U083" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="3FjhIeasooue" aggregation="none" type="tuIzeslDqJW5" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="SVt73uiMGu5x" type="P0toAiR6U083" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="3FjhIeasooue" type="tuIzeslDqJW5" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Generalization isSpecification="false" child="9m8Qj7mNVHWt" visibility="public" namespace="Logical View" xmi.id="th9P9NXUOrdg" parent="tuIzeslDqJW5" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="zjtlyOUtbbhP" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="9m8Qj7mNVHWt" xmi.id="th9P9NXUOrdg" parent="tuIzeslDqJW5" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="zjtlyOUtbbhP" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="fxFi3NzTrqZu" aggregation="composite" type="oRwdH97rBGn9" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="kHE0CKvDZfup" aggregation="none" type="xC9oqvTbtqno" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="fxFi3NzTrqZu" type="oRwdH97rBGn9" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="kHE0CKvDZfup" type="xC9oqvTbtqno" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="GG1DJNkCSAyv" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="GG1DJNkCSAyv" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="JSh7GZjtUwcV" aggregation="none" type="pXwBgpXvFPTv" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="IZz9QY18pF7z" aggregation="none" type="pXwBgpXvFPTv" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="JSh7GZjtUwcV" type="pXwBgpXvFPTv" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="IZz9QY18pF7z" type="pXwBgpXvFPTv" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="Ib6IrepGhyQ0" isRoot="false" isAbstract="false" name="CriterionType" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Ib6IrepGhyQ0" name="CriterionType" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="NKeU1TLhTRVQ" type="C7h2uwZmyT9F" name="name" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="vV84GTGoQrZ5" type="fBOv7853nHek" name="description" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="svIFDwhFP0uq" type="8Z1uofebJiDB" name="allowSimultaneousCriterionPerResource" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="RPFGkG9DOCUp" type="wJV2dO2fvbcR" name="allowHierarchy" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="SGGJpLofE6vS" type="6TQ6Ez2FKbOm" name="resource" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="NKeU1TLhTRVQ" type="C7h2uwZmyT9F" name="name" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="vV84GTGoQrZ5" type="fBOv7853nHek" name="description" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="svIFDwhFP0uq" type="8Z1uofebJiDB" name="allowSimultaneousCriterionPerResource" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="RPFGkG9DOCUp" type="wJV2dO2fvbcR" name="allowHierarchy" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="SGGJpLofE6vS" type="6TQ6Ez2FKbOm" name="resource" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="kf8mpoxDjBmw" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="kf8mpoxDjBmw" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="7mcaiC5yj477" aggregation="none" type="F2fAyFCIedxF" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="c8GQMLPtLay1" aggregation="none" type="pXwBgpXvFPTv" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="7mcaiC5yj477" type="F2fAyFCIedxF" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="c8GQMLPtLay1" type="pXwBgpXvFPTv" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="vLMfU7ZEDrxm" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="vLMfU7ZEDrxm" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="epw9OyrViR3P" aggregation="none" type="Ib6IrepGhyQ0" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="d9NNDTUobiEv" aggregation="none" type="pXwBgpXvFPTv" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="epw9OyrViR3P" type="Ib6IrepGhyQ0" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="d9NNDTUobiEv" type="pXwBgpXvFPTv" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="oyg1ocmICO1U" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="oyg1ocmICO1U" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="1bpN9lMoaIvy" aggregation="none" type="F2fAyFCIedxF" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="GkSxAVMleh6q" aggregation="none" type="QuCpOvJF0Q5L" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="1bpN9lMoaIvy" type="F2fAyFCIedxF" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="GkSxAVMleh6q" type="QuCpOvJF0Q5L" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="xSY8oXawKimC" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="xSY8oXawKimC" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="AbckHofJPSeZ" aggregation="none" type="QuCpOvJF0Q5L" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="D0LmIEkWwAT4" aggregation="none" type="pWd0kqSVARYy" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="AbckHofJPSeZ" type="QuCpOvJF0Q5L" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="D0LmIEkWwAT4" type="pWd0kqSVARYy" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Generalization isSpecification="false" child="zOVY0BwVHuvE" visibility="public" namespace="Logical View" xmi.id="g8YcVjpn2tyC" parent="xC9oqvTbtqno" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="cMgl4VNTAnuf" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="zOVY0BwVHuvE" xmi.id="g8YcVjpn2tyC" parent="xC9oqvTbtqno" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="cMgl4VNTAnuf" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="enqGVw6fViPn" aggregation="none" type="zOVY0BwVHuvE" name="" multiplicity="0..*" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="W54uViRjikVy" aggregation="none" type="EuVtTEVBubBT" name="" multiplicity="1..1" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" multiplicity="0..*" xmi.id="enqGVw6fViPn" type="zOVY0BwVHuvE" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1..1" xmi.id="W54uViRjikVy" type="EuVtTEVBubBT" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Generalization isSpecification="false" child="l4f7vJlc79Qq" visibility="public" namespace="Logical View" xmi.id="C7h2uwZmyT9F" parent="tuIzeslDqJW5" discriminator="" name="" />
-      <UML:Generalization isSpecification="false" child="whCdzX4JqC3B" visibility="public" namespace="Logical View" xmi.id="fBOv7853nHek" parent="Qi0Wq6l4HwkA" discriminator="" name="" />
-      <UML:Generalization isSpecification="false" child="4n9qXqbwYbSM" visibility="public" namespace="Logical View" xmi.id="8Z1uofebJiDB" parent="Qi0Wq6l4HwkA" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="wJV2dO2fvbcR" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="l4f7vJlc79Qq" xmi.id="C7h2uwZmyT9F" parent="tuIzeslDqJW5" name="" />
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="whCdzX4JqC3B" xmi.id="fBOv7853nHek" parent="Qi0Wq6l4HwkA" name="" />
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="4n9qXqbwYbSM" xmi.id="8Z1uofebJiDB" parent="Qi0Wq6l4HwkA" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="wJV2dO2fvbcR" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="wDUqOyv2llGG" aggregation="none" type="MJAjMsm0lkhn" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="hNwB3JwYM0Qs" aggregation="none" type="Qi0Wq6l4HwkA" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="wDUqOyv2llGG" type="MJAjMsm0lkhn" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="hNwB3JwYM0Qs" type="Qi0Wq6l4HwkA" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="6TQ6Ez2FKbOm" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="6TQ6Ez2FKbOm" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="grbMZ4KTHoJd" aggregation="aggregate" type="9m8Qj7mNVHWt" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="mEdWxukfFeoI" aggregation="none" type="tuIzeslDqJW5" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="grbMZ4KTHoJd" type="9m8Qj7mNVHWt" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="mEdWxukfFeoI" type="tuIzeslDqJW5" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="hSbZH0wWFekO" isRoot="false" isAbstract="false" name="MachineWorkersConfigurationUnit" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="hSbZH0wWFekO" name="MachineWorkersConfigurationUnit" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="GeLKfWmQuIBU" type="Cq6BA0nXsCXx" name="machineHumanHourRate" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="GeLKfWmQuIBU" type="Cq6BA0nXsCXx" name="machineHumanHourRate" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="Kw2aCKPV84kE" isRoot="false" isAbstract="false" name="MachineWorkerAssigment" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Kw2aCKPV84kE" name="MachineWorkerAssigment" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="OfmZd8GsCYKE" type="DtuyEvXi0kBC" name="start_date" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="SkF33CAV0aTV" type="f7oGUkbSGEeR" name="end_date" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="OfmZd8GsCYKE" type="DtuyEvXi0kBC" name="start_date" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="SkF33CAV0aTV" type="f7oGUkbSGEeR" name="end_date" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="0jiGA0CLh1ex" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="0jiGA0CLh1ex" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="ArCNWyfUiSmQ" aggregation="none" type="BYZCrni1720s" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="gxoigYIScMTS" aggregation="none" type="hSbZH0wWFekO" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="ArCNWyfUiSmQ" type="BYZCrni1720s" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="gxoigYIScMTS" type="hSbZH0wWFekO" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="E3t7mJFEbW5r" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="E3t7mJFEbW5r" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="j73INApV2zsY" aggregation="none" type="hSbZH0wWFekO" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="xW2fym5cjtKO" aggregation="none" type="pXwBgpXvFPTv" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="j73INApV2zsY" type="hSbZH0wWFekO" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="xW2fym5cjtKO" type="pXwBgpXvFPTv" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="A0sRjiv11VBq" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="A0sRjiv11VBq" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="PdqzzJSgOVym" aggregation="none" type="EuVtTEVBubBT" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="emHgl8EjeEOc" aggregation="none" type="Kw2aCKPV84kE" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="PdqzzJSgOVym" type="EuVtTEVBubBT" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="emHgl8EjeEOc" type="Kw2aCKPV84kE" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="DtuyEvXi0kBC" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="DtuyEvXi0kBC" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="0SEiJZ6jAui7" aggregation="aggregate" type="tuIzeslDqJW5" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="B8nXejJGVZwH" aggregation="none" type="MJAjMsm0lkhn" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="0SEiJZ6jAui7" type="tuIzeslDqJW5" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="B8nXejJGVZwH" type="MJAjMsm0lkhn" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="f7oGUkbSGEeR" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="f7oGUkbSGEeR" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="h8yJMKvKm706" aggregation="none" type="tuIzeslDqJW5" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="e4poyXv7ggfI" aggregation="none" type="Qi0Wq6l4HwkA" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="h8yJMKvKm706" type="tuIzeslDqJW5" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="e4poyXv7ggfI" type="Qi0Wq6l4HwkA" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="iPkaZGslsKcu" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="iPkaZGslsKcu" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="QwWvTSA8Y8Ru" aggregation="aggregate" type="hSbZH0wWFekO" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="TKCDSDJ6H6tE" aggregation="none" type="Kw2aCKPV84kE" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="QwWvTSA8Y8Ru" type="hSbZH0wWFekO" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="TKCDSDJ6H6tE" type="Kw2aCKPV84kE" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="Cq6BA0nXsCXx" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="Cq6BA0nXsCXx" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="coJGTwWtt2mK" aggregation="none" type="aaComrF6S2Lu" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="SvT01ssUD2gd" aggregation="none" type="Qi0Wq6l4HwkA" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="coJGTwWtt2mK" type="aaComrF6S2Lu" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="SvT01ssUD2gd" type="Qi0Wq6l4HwkA" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="ntefL6x2Ab2r" isRoot="false" isAbstract="false" name="BaseCalendar" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="ntefL6x2Ab2r" name="BaseCalendar" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="zp1sSWkZz6nk" type="2pLDU7Dy6Iu6" name="name" />
-        <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="z74lI5HtRIqo" isRoot="false" isAbstract="false" isQuery="false" name="getWorkableHoursInDate" >
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="zp1sSWkZz6nk" type="2pLDU7Dy6Iu6" name="name" />
+        <UML:Operation visibility="public" isSpecification="false" isQuery="false" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="z74lI5HtRIqo" name="getWorkableHoursInDate" >
          <UML:BehavioralFeature.parameter>
           <UML:Parameter kind="return" xmi.id="cqr467YH52pq" type="BxRhMi93e0js" />
-          <UML:Parameter isSpecification="false" visibility="private" xmi.id="NuesEj9HT0FV" value="" type="VyGIwPHyTZLs" name="date" />
+          <UML:Parameter visibility="private" isSpecification="false" xmi.id="NuesEj9HT0FV" type="VyGIwPHyTZLs" value="" name="date" />
          </UML:BehavioralFeature.parameter>
         </UML:Operation>
-        <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="Nm66iY5VrpnC" isRoot="false" isAbstract="false" isQuery="false" name="getWorkableHoursInPeriod" >
+        <UML:Operation visibility="public" isSpecification="false" isQuery="false" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Nm66iY5VrpnC" name="getWorkableHoursInPeriod" >
          <UML:BehavioralFeature.parameter>
           <UML:Parameter kind="return" xmi.id="ZTHgADaeuhs0" type="BxRhMi93e0js" />
-          <UML:Parameter isSpecification="false" visibility="private" xmi.id="hQ2u7C9aAO3N" value="" type="VyGIwPHyTZLs" name="initDate" />
-          <UML:Parameter isSpecification="false" visibility="private" xmi.id="UIITD0UYkYeT" value="" type="VyGIwPHyTZLs" name="endDate" />
+          <UML:Parameter visibility="private" isSpecification="false" xmi.id="hQ2u7C9aAO3N" type="VyGIwPHyTZLs" value="" name="initDate" />
+          <UML:Parameter visibility="private" isSpecification="false" xmi.id="UIITD0UYkYeT" type="VyGIwPHyTZLs" value="" name="endDate" />
          </UML:BehavioralFeature.parameter>
         </UML:Operation>
-        <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="WGjvnfNknTK9" isRoot="false" isAbstract="false" isQuery="false" name="getAsignableIntervals" >
+        <UML:Operation visibility="public" isSpecification="false" isQuery="false" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="WGjvnfNknTK9" name="getAsignableIntervals" >
          <UML:BehavioralFeature.parameter>
-          <UML:Parameter isSpecification="false" visibility="private" xmi.id="0xiGl2m1lfoR" value="" type="zIPqKcZ2wTbx" name="startDate" />
-          <UML:Parameter isSpecification="false" visibility="private" xmi.id="2YCTsKR8jHSJ" value="" type="zIPqKcZ2wTbx" name="endDate" />
+          <UML:Parameter visibility="private" isSpecification="false" xmi.id="0xiGl2m1lfoR" type="zIPqKcZ2wTbx" value="" name="startDate" />
+          <UML:Parameter visibility="private" isSpecification="false" xmi.id="2YCTsKR8jHSJ" type="zIPqKcZ2wTbx" value="" name="endDate" />
          </UML:BehavioralFeature.parameter>
         </UML:Operation>
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="2pLDU7Dy6Iu6" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="2pLDU7Dy6Iu6" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="xQjoQT8sOZqQ" aggregation="none" type="tuIzeslDqJW5" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="SisdkYGyWxTa" aggregation="none" type="aaComrF6S2Lu" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="xQjoQT8sOZqQ" type="tuIzeslDqJW5" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="SisdkYGyWxTa" type="aaComrF6S2Lu" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="jkgXjYzFGWEM" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="jkgXjYzFGWEM" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="YAEx86n5UWtu" aggregation="composite" type="ntefL6x2Ab2r" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="z0kMZamzGccy" aggregation="none" type="byxyj0hGxJuG" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="YAEx86n5UWtu" type="ntefL6x2Ab2r" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="z0kMZamzGccy" type="byxyj0hGxJuG" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Generalization isSpecification="false" child="pWd0kqSVARYy" visibility="public" namespace="Logical View" xmi.id="44THOkEiSaKg" parent="ntefL6x2Ab2r" discriminator="" name="" />
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="djb5JvjZ9GTh" isRoot="false" isAbstract="false" name="CalendarData" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="pWd0kqSVARYy" xmi.id="44THOkEiSaKg" parent="ntefL6x2Ab2r" name="" />
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="djb5JvjZ9GTh" name="CalendarData" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="qi6SnfkNY1Vo" type="hAf0l1kIOBtM" name="expiringDate" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="GsIdPH6DaubE" type="2MUnal52hXpk" name="hoursPerDate" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="qi6SnfkNY1Vo" type="hAf0l1kIOBtM" name="expiringDate" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="GsIdPH6DaubE" type="2MUnal52hXpk" name="hoursPerDate" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="Afd0dwO3L3WW" name="versions" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="Afd0dwO3L3WW" name="versions" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="X4h1YbtVbdp8" aggregation="aggregate" type="djb5JvjZ9GTh" name="" multiplicity="1" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Bb8PCkNNbI2N" aggregation="none" type="ntefL6x2Ab2r" name="" multiplicity="1" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1" xmi.id="X4h1YbtVbdp8" type="djb5JvjZ9GTh" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1" xmi.id="Bb8PCkNNbI2N" type="ntefL6x2Ab2r" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="UQIwL0cnKBy8" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="UQIwL0cnKBy8" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="dFj9gylB0SAY" aggregation="none" type="tuIzeslDqJW5" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="311cerlnQrCc" aggregation="none" type="aaComrF6S2Lu" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="dFj9gylB0SAY" type="tuIzeslDqJW5" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="311cerlnQrCc" type="aaComrF6S2Lu" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="20Vbv9iLVgLw" name="parent" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="20Vbv9iLVgLw" name="parent" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="ZXxApzVTCEaq" aggregation="none" type="djb5JvjZ9GTh" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="ALzAn9gpAiPm" aggregation="none" type="ntefL6x2Ab2r" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="ZXxApzVTCEaq" type="djb5JvjZ9GTh" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="ALzAn9gpAiPm" type="ntefL6x2Ab2r" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="hAf0l1kIOBtM" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="hAf0l1kIOBtM" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="X8XvzhYXFTf2" aggregation="composite" type="l4f7vJlc79Qq" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="RBVdN3UYMTi8" aggregation="none" type="aDjWeslUEANx" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="X8XvzhYXFTf2" type="l4f7vJlc79Qq" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="RBVdN3UYMTi8" type="aDjWeslUEANx" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="2MUnal52hXpk" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="2MUnal52hXpk" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="bPvj5KUaRzVO" aggregation="none" type="tuIzeslDqJW5" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="h1vwVbywmSX9" aggregation="none" type="UwUp5iYgVB85" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="bPvj5KUaRzVO" type="tuIzeslDqJW5" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="h1vwVbywmSX9" type="UwUp5iYgVB85" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="ID5eRbJXppCu" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="ID5eRbJXppCu" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="T1fqTOw2lrjo" aggregation="composite" type="tuIzeslDqJW5" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="9BOaBtzsvsmO" aggregation="none" type="UwUp5iYgVB85" name="" multiplicity="0..*" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="T1fqTOw2lrjo" type="tuIzeslDqJW5" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="0..*" xmi.id="9BOaBtzsvsmO" type="UwUp5iYgVB85" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="3oF4IIw3C3pt" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="3oF4IIw3C3pt" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="TiKD8rLar0QI" aggregation="aggregate" type="ntefL6x2Ab2r" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="MKI5B1tKDHvO" aggregation="none" type="djb5JvjZ9GTh" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="TiKD8rLar0QI" type="ntefL6x2Ab2r" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="MKI5B1tKDHvO" type="djb5JvjZ9GTh" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="uvVTa3RmuzlY" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="uvVTa3RmuzlY" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="9sE4kyQCgkPn" aggregation="none" type="UwUp5iYgVB85" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="ZkNOjlg55yBE" aggregation="none" type="bmRPNtkrYrn4" name="" multiplicity="1..1" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="9sE4kyQCgkPn" type="UwUp5iYgVB85" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1..1" xmi.id="ZkNOjlg55yBE" type="bmRPNtkrYrn4" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="u366LeqgoLzY" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="u366LeqgoLzY" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="y2YBIRXRJjT2" aggregation="composite" type="UwUp5iYgVB85" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="htELbd8AMTZ5" aggregation="none" type="QX7KUtq8V8Jy" name="" multiplicity="0..*" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="y2YBIRXRJjT2" type="UwUp5iYgVB85" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="0..*" xmi.id="htELbd8AMTZ5" type="QX7KUtq8V8Jy" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Generalization isSpecification="false" child="QJ2FNvib6KPZ" visibility="public" namespace="Logical View" xmi.id="q6mcBRoUvl4K" parent="bmRPNtkrYrn4" discriminator="" name="" />
-      <UML:Generalization isSpecification="false" child="LHL7LiEKnuNC" visibility="public" namespace="Logical View" xmi.id="2zQEOGZFsPzF" parent="bmRPNtkrYrn4" discriminator="" name="" />
-      <UML:Generalization isSpecification="false" child="HFZEFQG7HpZi" visibility="public" namespace="Logical View" xmi.id="aRsr6290OD8w" parent="xC9oqvTbtqno" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="23vNzz7nvtby" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="QJ2FNvib6KPZ" xmi.id="q6mcBRoUvl4K" parent="bmRPNtkrYrn4" name="" />
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="LHL7LiEKnuNC" xmi.id="2zQEOGZFsPzF" parent="bmRPNtkrYrn4" name="" />
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="HFZEFQG7HpZi" xmi.id="aRsr6290OD8w" parent="xC9oqvTbtqno" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="23vNzz7nvtby" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="CF8HCHVAK2Ja" aggregation="none" type="zOVY0BwVHuvE" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Tq1nZSnGL1bw" aggregation="none" type="o5mCGv6T0zJ1" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="CF8HCHVAK2Ja" type="zOVY0BwVHuvE" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="Tq1nZSnGL1bw" type="o5mCGv6T0zJ1" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="iXjikXNn4Hey" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="iXjikXNn4Hey" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="ci4y9d1Mr8b1" aggregation="none" type="xC9oqvTbtqno" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="P5Bh7UHaIGLr" aggregation="none" type="o5mCGv6T0zJ1" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="ci4y9d1Mr8b1" type="xC9oqvTbtqno" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="P5Bh7UHaIGLr" type="o5mCGv6T0zJ1" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="bvqHRyC96Wa2" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="bvqHRyC96Wa2" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="i8517exkM2iW" aggregation="none" type="xC9oqvTbtqno" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="disUqRTDWevd" aggregation="none" type="o5mCGv6T0zJ1" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="i8517exkM2iW" type="xC9oqvTbtqno" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="disUqRTDWevd" type="o5mCGv6T0zJ1" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="i11mVbmIp891" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="i11mVbmIp891" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="6ACOPVF7cK9j" aggregation="none" type="zOVY0BwVHuvE" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="z4TJ4Angsf8g" aggregation="none" type="o5mCGv6T0zJ1" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="6ACOPVF7cK9j" type="zOVY0BwVHuvE" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="z4TJ4Angsf8g" type="o5mCGv6T0zJ1" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="lyv5tS6Uncy0" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="lyv5tS6Uncy0" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="5ctbGmFNvPlK" aggregation="none" type="9JJu7hjphMwH" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="uzPWHWGEZhYb" aggregation="none" type="ntefL6x2Ab2r" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="5ctbGmFNvPlK" type="9JJu7hjphMwH" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="uzPWHWGEZhYb" type="ntefL6x2Ab2r" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="SAiaWhgPXIk9" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="SAiaWhgPXIk9" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="pLHfzQL42DfI" aggregation="none" type="xC9oqvTbtqno" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="xsdsHNACKYgb" aggregation="none" type="o5mCGv6T0zJ1" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="pLHfzQL42DfI" type="xC9oqvTbtqno" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="xsdsHNACKYgb" type="o5mCGv6T0zJ1" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="L7U64083ITM9" isRoot="false" isAbstract="false" name="TaskMilestone" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="L7U64083ITM9" name="TaskMilestone" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="bmmZXzV3Bv4h" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Generalization isSpecification="false" child="L7U64083ITM9" visibility="public" namespace="Logical View" xmi.id="bmmZXzV3Bv4h" parent="9JJu7hjphMwH" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="WAT4KbzXr4jk" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="L7U64083ITM9" xmi.id="bmmZXzV3Bv4h" parent="9JJu7hjphMwH" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="WAT4KbzXr4jk" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="sQkubOBZGmPW" aggregation="aggregate" type="ip8LnfNpfMJo" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="9YgT6M56Ftgp" aggregation="none" type="pXwBgpXvFPTv" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="sQkubOBZGmPW" type="ip8LnfNpfMJo" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="9YgT6M56Ftgp" type="pXwBgpXvFPTv" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Generalization isSpecification="false" child="HFZEFQG7HpZi" visibility="public" namespace="Logical View" xmi.id="nW53miILv2NX" parent="zOVY0BwVHuvE" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="HMHBOcgbsD7k" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="HFZEFQG7HpZi" xmi.id="nW53miILv2NX" parent="zOVY0BwVHuvE" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="HMHBOcgbsD7k" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="HrEwJHdAgL4H" aggregation="none" type="xC9oqvTbtqno" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="hDoy0ES7m8Zq" aggregation="none" type="EuVtTEVBubBT" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="HrEwJHdAgL4H" type="xC9oqvTbtqno" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="hDoy0ES7m8Zq" type="EuVtTEVBubBT" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="e9SWKZFg28R5" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="e9SWKZFg28R5" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="ScuhVaUkRhgj" aggregation="none" type="zOVY0BwVHuvE" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="yJtedvwK7kG7" aggregation="none" type="EuVtTEVBubBT" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="ScuhVaUkRhgj" type="zOVY0BwVHuvE" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="yJtedvwK7kG7" type="EuVtTEVBubBT" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="bFNe0zhsM3Ej" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="bFNe0zhsM3Ej" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="wiCgqlUHNPys" aggregation="none" type="zOVY0BwVHuvE" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="xTcNAH66axlB" aggregation="none" type="o5mCGv6T0zJ1" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="wiCgqlUHNPys" type="zOVY0BwVHuvE" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="xTcNAH66axlB" type="o5mCGv6T0zJ1" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="gPUkG7gP5S20" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="gPUkG7gP5S20" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="sfWzNm4KTHyH" aggregation="aggregate" type="zOVY0BwVHuvE" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2TYQqVGnyrA6" aggregation="none" type="YpNtsZci2NR9" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="sfWzNm4KTHyH" type="zOVY0BwVHuvE" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="2TYQqVGnyrA6" type="YpNtsZci2NR9" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="mEGPrjbUf0X4" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="mEGPrjbUf0X4" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="8EAgBvs4YM1w" aggregation="none" type="xC9oqvTbtqno" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="64EZLCrLdNlR" aggregation="none" type="o5mCGv6T0zJ1" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="8EAgBvs4YM1w" type="xC9oqvTbtqno" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="64EZLCrLdNlR" type="o5mCGv6T0zJ1" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Generalization isSpecification="false" child="ip8LnfNpfMJo" visibility="public" namespace="Logical View" xmi.id="GvUkFUrye1Yl" parent="xC9oqvTbtqno" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="8pZmq7VPM3mb" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="ip8LnfNpfMJo" xmi.id="GvUkFUrye1Yl" parent="xC9oqvTbtqno" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="8pZmq7VPM3mb" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="s0DorNuxc3dl" aggregation="aggregate" type="xC9oqvTbtqno" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="yTnXnpRutfRC" aggregation="none" type="YpNtsZci2NR9" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="s0DorNuxc3dl" type="xC9oqvTbtqno" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="yTnXnpRutfRC" type="YpNtsZci2NR9" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="3ZV6J5w3YLsH" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="3ZV6J5w3YLsH" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="pGXReHsWH5L6" aggregation="none" type="ip8LnfNpfMJo" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="RD11GcmD6air" aggregation="none" type="pXwBgpXvFPTv" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="pGXReHsWH5L6" type="ip8LnfNpfMJo" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="RD11GcmD6air" type="pXwBgpXvFPTv" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="51uzbFU0KUu9" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="51uzbFU0KUu9" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="N9lEmBObRv25" aggregation="none" type="ip8LnfNpfMJo" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="CtcRwvVN8WOP" aggregation="none" type="EuVtTEVBubBT" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="N9lEmBObRv25" type="ip8LnfNpfMJo" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="CtcRwvVN8WOP" type="EuVtTEVBubBT" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Generalization isSpecification="false" child="8A8KfC0gS3t4" visibility="public" namespace="Logical View" xmi.id="ECeqpWy8psFU" parent="9JJu7hjphMwH" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="EehA3r9cC9zf" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="8A8KfC0gS3t4" xmi.id="ECeqpWy8psFU" parent="9JJu7hjphMwH" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="EehA3r9cC9zf" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="99aDjI44RoGB" aggregation="none" type="0WUme5I6QUAL" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="zemQZnUke69a" aggregation="none" type="pXwBgpXvFPTv" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="99aDjI44RoGB" type="0WUme5I6QUAL" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="zemQZnUke69a" type="pXwBgpXvFPTv" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="4xsyjJuI5D3M" isRoot="false" isAbstract="false" name="WorkReport" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="4xsyjJuI5D3M" name="WorkReport" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="730I6Vkw2URQ" type="G2AvGRcerKjs" name="date" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="F96oiFnleFdO" type="4YAtstkgyI1r" name="place" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="a7YiAYyH1jB1" type="zL8zSOAIcaT1" name="responsible" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="730I6Vkw2URQ" type="G2AvGRcerKjs" name="date" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="F96oiFnleFdO" type="4YAtstkgyI1r" name="place" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="a7YiAYyH1jB1" type="zL8zSOAIcaT1" name="responsible" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="rAYL8dKCYC8F" isRoot="false" isAbstract="false" name="WorkReportType" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="rAYL8dKCYC8F" name="WorkReportType" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="mYqB3VSrZlVQ" type="v4p7BokGfDJi" name="name" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="uo7rIrSfc9PG" type="qdTUeCLBaJts" name="dateIsSharedByLines" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="A1lEVIeKIOFr" type="qdTUeCLBaJts" name="resourceIsSharedInLines" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="vAdCXV0cLGTn" type="qdTUeCLBaJts" name="commonWorkReportOrderElement" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="RdB3nsVI4Qma" type="qdTUeCLBaJts" name="orderElementIsSharedInLines" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="mYqB3VSrZlVQ" type="v4p7BokGfDJi" name="name" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="uo7rIrSfc9PG" type="qdTUeCLBaJts" name="dateIsSharedByLines" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="A1lEVIeKIOFr" type="qdTUeCLBaJts" name="resourceIsSharedInLines" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="vAdCXV0cLGTn" type="qdTUeCLBaJts" name="commonWorkReportOrderElement" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="RdB3nsVI4Qma" type="qdTUeCLBaJts" name="orderElementIsSharedInLines" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="VWCYsJfAAbTA" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="VWCYsJfAAbTA" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="SBM6HVgG8cMG" aggregation="composite" type="rAYL8dKCYC8F" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="vqWOtyZFUjzo" aggregation="none" type="Ib6IrepGhyQ0" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="SBM6HVgG8cMG" type="rAYL8dKCYC8F" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="vqWOtyZFUjzo" type="Ib6IrepGhyQ0" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="ye3ZfDUlzk4J" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="ye3ZfDUlzk4J" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Ct5GYmu0yG4D" aggregation="none" type="rAYL8dKCYC8F" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="klSqLo4GcZdV" aggregation="none" type="Ib6IrepGhyQ0" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="Ct5GYmu0yG4D" type="rAYL8dKCYC8F" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="klSqLo4GcZdV" type="Ib6IrepGhyQ0" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Generalization isSpecification="false" child="ZM0OVzwqw9j7" visibility="public" namespace="Logical View" xmi.id="v4p7BokGfDJi" parent="YpNtsZci2NR9" discriminator="" name="" />
-      <UML:Generalization isSpecification="false" child="0WUme5I6QUAL" visibility="public" namespace="Logical View" xmi.id="G2AvGRcerKjs" parent="YpNtsZci2NR9" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="4YAtstkgyI1r" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="ZM0OVzwqw9j7" xmi.id="v4p7BokGfDJi" parent="YpNtsZci2NR9" name="" />
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="0WUme5I6QUAL" xmi.id="G2AvGRcerKjs" parent="YpNtsZci2NR9" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="4YAtstkgyI1r" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="XAjztil5ZqM8" aggregation="aggregate" type="ip8LnfNpfMJo" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="aE6WTBkBuAzF" aggregation="none" type="0WUme5I6QUAL" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="XAjztil5ZqM8" type="ip8LnfNpfMJo" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="aE6WTBkBuAzF" type="0WUme5I6QUAL" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="zL8zSOAIcaT1" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="zL8zSOAIcaT1" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="y4UYd748Hn58" aggregation="none" type="YpNtsZci2NR9" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="TqE2eY8CmFjF" aggregation="none" type="pXwBgpXvFPTv" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="y4UYd748Hn58" type="YpNtsZci2NR9" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="TqE2eY8CmFjF" type="pXwBgpXvFPTv" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="RvvXI8gOvMbg" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="RvvXI8gOvMbg" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="QROKbOXXS153" aggregation="none" type="4xsyjJuI5D3M" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="699LuEUN2iOe" aggregation="none" type="rAYL8dKCYC8F" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="QROKbOXXS153" type="4xsyjJuI5D3M" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="699LuEUN2iOe" type="rAYL8dKCYC8F" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="kOXTy1K6CLkK" isRoot="false" isAbstract="false" name="WorkReportLine" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="kOXTy1K6CLkK" name="WorkReportLine" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="sqyUzdDL8eJ7" type="c5awcauVaslZ" name="numHours" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="sqyUzdDL8eJ7" type="c5awcauVaslZ" name="numHours" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="n9jPhAOm0pF1" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="n9jPhAOm0pF1" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="0z4QyAR5HaQC" aggregation="none" type="ip8LnfNpfMJo" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="msXmYvOmQDn9" aggregation="none" type="pXwBgpXvFPTv" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="0z4QyAR5HaQC" type="ip8LnfNpfMJo" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="msXmYvOmQDn9" type="pXwBgpXvFPTv" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Generalization isSpecification="false" child="0WUme5I6QUAL" visibility="public" namespace="Logical View" xmi.id="c5awcauVaslZ" parent="YpNtsZci2NR9" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="yX4w9Ly1AxT7" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="0WUme5I6QUAL" xmi.id="c5awcauVaslZ" parent="YpNtsZci2NR9" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="yX4w9Ly1AxT7" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="izHfZiCafHye" aggregation="composite" type="4xsyjJuI5D3M" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="PQjey7qlyMVW" aggregation="none" type="kOXTy1K6CLkK" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="izHfZiCafHye" type="4xsyjJuI5D3M" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="PQjey7qlyMVW" type="kOXTy1K6CLkK" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="AC0grSIA94RD" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="AC0grSIA94RD" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="FsJf56nn34Sc" aggregation="none" type="kOXTy1K6CLkK" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="kdAQu94HXlvV" aggregation="none" type="QuCpOvJF0Q5L" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="FsJf56nn34Sc" type="kOXTy1K6CLkK" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="kdAQu94HXlvV" type="QuCpOvJF0Q5L" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="9mBJoaWvbrg5" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="9mBJoaWvbrg5" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="qkEo6kLLcezf" aggregation="none" type="kOXTy1K6CLkK" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="ikQjmrLWUWuO" aggregation="none" type="tuIzeslDqJW5" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="qkEo6kLLcezf" type="kOXTy1K6CLkK" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="ikQjmrLWUWuO" type="tuIzeslDqJW5" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Generalization isSpecification="false" child="F56Fpf6oVy2F" visibility="public" namespace="Logical View" xmi.id="E38AqfH4iLJV" parent="YpNtsZci2NR9" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="fNiLi0qhO9Dg" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="F56Fpf6oVy2F" xmi.id="E38AqfH4iLJV" parent="YpNtsZci2NR9" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="fNiLi0qhO9Dg" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="dydAhYfWIuKM" aggregation="aggregate" type="zOVY0BwVHuvE" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="cdiCFfrvPFeB" aggregation="none" type="F56Fpf6oVy2F" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="dydAhYfWIuKM" type="zOVY0BwVHuvE" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="cdiCFfrvPFeB" type="F56Fpf6oVy2F" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="10mN8z3YuI93" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="10mN8z3YuI93" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="6yfaSaw5YZFE" aggregation="aggregate" type="ip8LnfNpfMJo" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="6skOk2lMgRWv" aggregation="none" type="0WUme5I6QUAL" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="6yfaSaw5YZFE" type="ip8LnfNpfMJo" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="6skOk2lMgRWv" type="0WUme5I6QUAL" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="5PKYSxAl3acS" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="5PKYSxAl3acS" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="6LpTbTehPJGr" aggregation="none" type="tuIzeslDqJW5" name="" multiplicity="0..N" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="rCwQk9cq2MCm" aggregation="none" type="J8SsPhfYKZmW" name="" multiplicity="0..N" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" multiplicity="0..N" xmi.id="6LpTbTehPJGr" type="tuIzeslDqJW5" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="0..N" xmi.id="rCwQk9cq2MCm" type="J8SsPhfYKZmW" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="xK9DiO4tJDUT" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="xK9DiO4tJDUT" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Ox72MdwQzlta" aggregation="none" type="4cyZLGRuFuQR" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="CXFcpVTggQ4O" aggregation="none" type="rAYL8dKCYC8F" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="Ox72MdwQzlta" type="4cyZLGRuFuQR" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="CXFcpVTggQ4O" type="rAYL8dKCYC8F" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="cCjTVCxVWMoz" isRoot="false" isAbstract="false" name="WorkReportLabelType" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="cCjTVCxVWMoz" name="WorkReportLabelType" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="2bnowREZaFLT" type="qdTUeCLBaJts" name="labelsSharedByLines" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="gZG5sASdyQSz" type="hpowrVWPlrw0" name="defaultLabel" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="2bnowREZaFLT" type="qdTUeCLBaJts" name="labelsSharedByLines" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="gZG5sASdyQSz" type="hpowrVWPlrw0" name="defaultLabel" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="BTXE19fHMeq8" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="BTXE19fHMeq8" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="4J7340bHWprJ" aggregation="aggregate" type="4cyZLGRuFuQR" name="" multiplicity="0..N" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="IKxyi2MIeYrf" aggregation="none" type="J8SsPhfYKZmW" name="" multiplicity="1..1" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="0..N" xmi.id="4J7340bHWprJ" type="4cyZLGRuFuQR" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1..1" xmi.id="IKxyi2MIeYrf" type="J8SsPhfYKZmW" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Generalization isSpecification="false" child="oRwdH97rBGn9" visibility="public" namespace="Logical View" xmi.id="PB91APUzEttp" parent="9JJu7hjphMwH" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="q0K4uDt3Em1T" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="oRwdH97rBGn9" xmi.id="PB91APUzEttp" parent="9JJu7hjphMwH" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="q0K4uDt3Em1T" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="xB0HcNxhh2il" aggregation="aggregate" type="8A8KfC0gS3t4" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="3I0X7rqPAnMs" aggregation="none" type="9JJu7hjphMwH" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="xB0HcNxhh2il" type="8A8KfC0gS3t4" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="3I0X7rqPAnMs" type="9JJu7hjphMwH" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="Xapy55bpozjS" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="Xapy55bpozjS" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="ng8SDy5895Pm" aggregation="none" type="byxyj0hGxJuG" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="SKR7N9rOPrvW" aggregation="none" type="Ib6IrepGhyQ0" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="ng8SDy5895Pm" type="byxyj0hGxJuG" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="SKR7N9rOPrvW" type="Ib6IrepGhyQ0" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="sv2rfSeIfx1V" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="sv2rfSeIfx1V" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="hlurWEhKsqm5" aggregation="none" type="rAYL8dKCYC8F" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="orDxuahKv6SG" aggregation="none" type="byxyj0hGxJuG" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="hlurWEhKsqm5" type="rAYL8dKCYC8F" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="orDxuahKv6SG" type="byxyj0hGxJuG" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="zkyUFYOMMgdJ" name="default" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="zkyUFYOMMgdJ" name="default" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="EJed8ZApI2eo" aggregation="none" type="byxyj0hGxJuG" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="GM88CsCyhPtb" aggregation="none" type="pXwBgpXvFPTv" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="EJed8ZApI2eo" type="byxyj0hGxJuG" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="GM88CsCyhPtb" type="pXwBgpXvFPTv" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="hpowrVWPlrw0" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="hpowrVWPlrw0" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="0bwtfM9tfnXn" aggregation="composite" type="tuIzeslDqJW5" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="KfbcfDOtZXzj" aggregation="none" type="QX7KUtq8V8Jy" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="0bwtfM9tfnXn" type="tuIzeslDqJW5" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="KfbcfDOtZXzj" type="QX7KUtq8V8Jy" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="jckNDAokE6Xg" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="jckNDAokE6Xg" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="NBh5ZbgXAaQn" aggregation="none" type="byxyj0hGxJuG" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="wZhZKCLcpuCU" aggregation="none" type="rAYL8dKCYC8F" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="NBh5ZbgXAaQn" type="byxyj0hGxJuG" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="wZhZKCLcpuCU" type="rAYL8dKCYC8F" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="XNWkT3Q27j8q" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="XNWkT3Q27j8q" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="7aNf5MMTW4W5" aggregation="none" type="rAYL8dKCYC8F" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="dAcll0YfXDDp" aggregation="none" type="cCjTVCxVWMoz" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="7aNf5MMTW4W5" type="rAYL8dKCYC8F" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="dAcll0YfXDDp" type="cCjTVCxVWMoz" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="ErNJbT9oXpJJ" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="ErNJbT9oXpJJ" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="PWREQdgVD3AH" aggregation="none" type="cCjTVCxVWMoz" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="OXisZExAOXt7" aggregation="none" type="4cyZLGRuFuQR" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="PWREQdgVD3AH" type="cCjTVCxVWMoz" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="OXisZExAOXt7" type="4cyZLGRuFuQR" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="AtXRDhBv3Cj3" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="AtXRDhBv3Cj3" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="XPn2dyr0UIDs" aggregation="aggregate" type="kOXTy1K6CLkK" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="ttN6vYLJ339a" aggregation="none" type="J8SsPhfYKZmW" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="XPn2dyr0UIDs" type="kOXTy1K6CLkK" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="ttN6vYLJ339a" type="J8SsPhfYKZmW" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="FONGY7K3RGjZ" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="FONGY7K3RGjZ" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="H6igbbn60Y8b" aggregation="aggregate" type="kOXTy1K6CLkK" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="UzcyFpq8iCCb" aggregation="none" type="pXwBgpXvFPTv" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="H6igbbn60Y8b" type="kOXTy1K6CLkK" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="UzcyFpq8iCCb" type="pXwBgpXvFPTv" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="qQVHgEoIVwSL" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="qQVHgEoIVwSL" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="kYslb1Jr71Xg" aggregation="none" type="J8SsPhfYKZmW" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="cImapuCJrmG6" aggregation="none" type="kOXTy1K6CLkK" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="kYslb1Jr71Xg" type="J8SsPhfYKZmW" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="cImapuCJrmG6" type="kOXTy1K6CLkK" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="EauhWK263zd3" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="EauhWK263zd3" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Z6EHIPr0xjjW" aggregation="none" type="kOXTy1K6CLkK" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="l2Nq3sXd9HCy" aggregation="none" type="pXwBgpXvFPTv" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="Z6EHIPr0xjjW" type="kOXTy1K6CLkK" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="l2Nq3sXd9HCy" type="pXwBgpXvFPTv" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="HRweRDeLQktl" isRoot="false" isAbstract="false" name="HoursCostType" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="PCYtHW2pKMSk" name="" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="HRweRDeLQktl" name="HoursCostType" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="PCYtHW2pKMSk" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="jnrgVYBEbY4c" aggregation="none" type="kOXTy1K6CLkK" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="PZEYrQU1kj2s" aggregation="none" type="HRweRDeLQktl" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="jnrgVYBEbY4c" type="kOXTy1K6CLkK" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="PZEYrQU1kj2s" type="HRweRDeLQktl" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="cWADNpRehIFv" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="cWADNpRehIFv" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="FAXpVRhCDWti" aggregation="none" type="kOXTy1K6CLkK" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="54weayEzWSVN" aggregation="none" type="HRweRDeLQktl" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="FAXpVRhCDWti" type="kOXTy1K6CLkK" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="54weayEzWSVN" type="HRweRDeLQktl" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="2QrSuVLLe0lg" isRoot="false" isAbstract="false" name="ResourcesCategory" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="2QrSuVLLe0lg" name="ResourcesCategory" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="yQr8FzuH4F0j" type="tV3Wvmkip9PE" name="initDate" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="DmfJScTuQ0q4" type="P6AEDaSI8OmX" name="endDate" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="yQr8FzuH4F0j" type="tV3Wvmkip9PE" name="initDate" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="DmfJScTuQ0q4" type="P6AEDaSI8OmX" name="endDate" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="y1Sxm7xSsawe" isRoot="false" isAbstract="false" name="HoursCosts" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="y1Sxm7xSsawe" name="HoursCosts" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="7NtOQ6P7RPjy" type="t9QzWAWJNjCI" name="priceCost" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="VbvwEOocMegG" type="u0gIjsab6Z3N" name="initDate" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="8D92c99x2YN9" type="oWDjdVOdMdgl" name="endDate" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="7NtOQ6P7RPjy" type="t9QzWAWJNjCI" name="priceCost" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="VbvwEOocMegG" type="u0gIjsab6Z3N" name="initDate" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="8D92c99x2YN9" type="oWDjdVOdMdgl" name="endDate" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="UMEqzuewt7te" isRoot="false" isAbstract="false" name="CostCategory" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="UMEqzuewt7te" name="CostCategory" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="KBPwV2alAnvD" type="IC1cnfMgnyr9" name="name" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="KBPwV2alAnvD" type="IC1cnfMgnyr9" name="name" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="Cq64Q1iClj5L" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="Cq64Q1iClj5L" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="i8lD4WDPzNzw" aggregation="none" type="y1Sxm7xSsawe" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="RFwWPYCXQoAj" aggregation="none" type="HRweRDeLQktl" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="i8lD4WDPzNzw" type="y1Sxm7xSsawe" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="RFwWPYCXQoAj" type="HRweRDeLQktl" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="Nvy7c4Sh5kt2" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="Nvy7c4Sh5kt2" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="v9t1Tbp9haKj" aggregation="aggregate" type="UMEqzuewt7te" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="7X84u7yJKsqj" aggregation="none" type="y1Sxm7xSsawe" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="v9t1Tbp9haKj" type="UMEqzuewt7te" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="7X84u7yJKsqj" type="y1Sxm7xSsawe" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="JbmI0V1A8Uxm" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="JbmI0V1A8Uxm" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Q0FqoPYjWRlx" aggregation="aggregate" type="QuCpOvJF0Q5L" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="0Y4f8OPDtXFm" aggregation="none" type="2QrSuVLLe0lg" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="Q0FqoPYjWRlx" type="QuCpOvJF0Q5L" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="0Y4f8OPDtXFm" type="2QrSuVLLe0lg" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="BI2Jk04C1b3W" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="BI2Jk04C1b3W" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="dD5x5vfVwuKi" aggregation="none" type="2QrSuVLLe0lg" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="HsSnHBjFjnup" aggregation="none" type="UMEqzuewt7te" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="dD5x5vfVwuKi" type="2QrSuVLLe0lg" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="HsSnHBjFjnup" type="UMEqzuewt7te" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="tV3Wvmkip9PE" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="tV3Wvmkip9PE" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="AJ13rGpUSvPX" aggregation="composite" type="UwUp5iYgVB85" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="o41iyJRDBrzQ" aggregation="none" type="KgJE71ZrTa4N" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="AJ13rGpUSvPX" type="UwUp5iYgVB85" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="o41iyJRDBrzQ" type="KgJE71ZrTa4N" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="P6AEDaSI8OmX" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="P6AEDaSI8OmX" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2ifjTZWdtXhi" aggregation="composite" type="KgJE71ZrTa4N" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="mUAEPZjCeiua" aggregation="none" type="QX7KUtq8V8Jy" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="2ifjTZWdtXhi" type="KgJE71ZrTa4N" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="mUAEPZjCeiua" type="QX7KUtq8V8Jy" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Generalization isSpecification="false" child="o5RjRxAkOrU1" visibility="public" namespace="Logical View" xmi.id="t9QzWAWJNjCI" parent="UwUp5iYgVB85" discriminator="" name="" />
-      <UML:Generalization isSpecification="false" child="KgJE71ZrTa4N" visibility="public" namespace="Logical View" xmi.id="u0gIjsab6Z3N" parent="UwUp5iYgVB85" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="oWDjdVOdMdgl" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="o5RjRxAkOrU1" xmi.id="t9QzWAWJNjCI" parent="UwUp5iYgVB85" name="" />
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="KgJE71ZrTa4N" xmi.id="u0gIjsab6Z3N" parent="UwUp5iYgVB85" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="oWDjdVOdMdgl" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="1LoACnaCTFvu" aggregation="composite" type="QX7KUtq8V8Jy" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="nQYgxDMhhWv5" aggregation="none" type="o5RjRxAkOrU1" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="1LoACnaCTFvu" type="QX7KUtq8V8Jy" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="nQYgxDMhhWv5" type="o5RjRxAkOrU1" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="IC1cnfMgnyr9" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="IC1cnfMgnyr9" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="3dFfL9ELT0Vd" aggregation="composite" type="o5RjRxAkOrU1" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="l4qEJj849ek5" aggregation="none" type="QX7KUtq8V8Jy" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="3dFfL9ELT0Vd" type="o5RjRxAkOrU1" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="l4qEJj849ek5" type="QX7KUtq8V8Jy" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="REhCQm4MOB01" isRoot="false" isAbstract="false" name="CalendarAvailability" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="eSlBekhCFNxV" name="" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="REhCQm4MOB01" name="CalendarAvailability" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="eSlBekhCFNxV" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="yTxRTR3EVtSm" aggregation="aggregate" type="pWd0kqSVARYy" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="aZriDZn3cXaA" aggregation="none" type="REhCQm4MOB01" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="yTxRTR3EVtSm" type="pWd0kqSVARYy" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="aZriDZn3cXaA" type="REhCQm4MOB01" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="0WqNRLCOXQXR" isRoot="false" isAbstract="false" name="CalendarException" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="0WqNRLCOXQXR" name="CalendarException" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="rqY20BdCRSZu" type="dCHs9h07Z9Vb" name="hours" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="OQFU8xBPdMAL" type="VyGIwPHyTZLs" name="date" />
-        <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="FfqvP3FJhzmB" isRoot="false" isAbstract="false" isQuery="false" name="isDayInException" >
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="rqY20BdCRSZu" type="dCHs9h07Z9Vb" name="hours" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="OQFU8xBPdMAL" type="VyGIwPHyTZLs" name="date" />
+        <UML:Operation visibility="public" isSpecification="false" isQuery="false" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="FfqvP3FJhzmB" name="isDayInException" >
          <UML:BehavioralFeature.parameter>
           <UML:Parameter kind="return" xmi.id="4AKXM6H4ks03" type="qdTUeCLBaJts" />
-          <UML:Parameter isSpecification="false" visibility="private" xmi.id="1XcM1xPTjFRo" value="" type="" name="date" />
+          <UML:Parameter visibility="private" isSpecification="false" xmi.id="1XcM1xPTjFRo" type="" value="" name="date" />
          </UML:BehavioralFeature.parameter>
         </UML:Operation>
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Generalization isSpecification="false" child="byxyj0hGxJuG" visibility="public" namespace="Logical View" xmi.id="pb6HwGdUgAtX" parent="0WqNRLCOXQXR" discriminator="" name="" />
-      <UML:Generalization isSpecification="false" child="byxyj0hGxJuG" visibility="public" namespace="Logical View" xmi.id="XMEBU7he2Yo3" parent="0WqNRLCOXQXR" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="bxb1FZ7c3xzw" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="byxyj0hGxJuG" xmi.id="pb6HwGdUgAtX" parent="0WqNRLCOXQXR" name="" />
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="byxyj0hGxJuG" xmi.id="XMEBU7he2Yo3" parent="0WqNRLCOXQXR" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="bxb1FZ7c3xzw" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="NOBqFcdp9SXK" aggregation="composite" type="ntefL6x2Ab2r" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="zINbovmx3WO0" aggregation="none" type="0WqNRLCOXQXR" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="NOBqFcdp9SXK" type="ntefL6x2Ab2r" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="zINbovmx3WO0" type="0WqNRLCOXQXR" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class stereotype="ValueObject" isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="9aZodH8figJs" isRoot="false" isAbstract="false" name="CalendarExceptionType" >
+      <UML:Class stereotype="ValueObject" visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="9aZodH8figJs" name="CalendarExceptionType" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="xPvbjGGSlqDm" type="hbXtOYMKK9AU" name="name" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="pDDCfbBFqNTu" type="7WR6rrQFg8vU" name="color" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="oGGUMPXyTx86" type="qdTUeCLBaJts" name="isNotAsignable" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="xPvbjGGSlqDm" type="hbXtOYMKK9AU" name="name" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="pDDCfbBFqNTu" type="7WR6rrQFg8vU" name="color" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="oGGUMPXyTx86" type="qdTUeCLBaJts" name="isNotAsignable" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="Wy2jH22C5H63" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="Wy2jH22C5H63" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="gCbpc7AaNVBB" aggregation="none" type="0WqNRLCOXQXR" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Rv7SQVRuuJsF" aggregation="none" type="9aZodH8figJs" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="gCbpc7AaNVBB" type="0WqNRLCOXQXR" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="Rv7SQVRuuJsF" type="9aZodH8figJs" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="hbXtOYMKK9AU" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="hbXtOYMKK9AU" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Wny3uYpaiOQJ" aggregation="none" type="9JJu7hjphMwH" name="" multiplicity="0..1" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="TYtr320Sy7vM" aggregation="none" type="tuIzeslDqJW5" name="" multiplicity="0..1" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="0..1" xmi.id="Wny3uYpaiOQJ" type="9JJu7hjphMwH" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="0..1" xmi.id="TYtr320Sy7vM" type="tuIzeslDqJW5" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="7WR6rrQFg8vU" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="7WR6rrQFg8vU" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="aKGUd9i7wg8o" aggregation="aggregate" type="9m8Qj7mNVHWt" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="CxNtLnCpJ5eM" aggregation="none" type="tuIzeslDqJW5" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="aKGUd9i7wg8o" type="9m8Qj7mNVHWt" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="CxNtLnCpJ5eM" type="tuIzeslDqJW5" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="CMWvZcLLrUfe" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="CMWvZcLLrUfe" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="7ep3kiNK2epd" aggregation="aggregate" type="P0toAiR6U083" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="lVifBqUOnrF6" aggregation="none" type="9m8Qj7mNVHWt" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="7ep3kiNK2epd" type="P0toAiR6U083" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="lVifBqUOnrF6" type="9m8Qj7mNVHWt" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="ms6mh1zsBySy" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="ms6mh1zsBySy" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="cRtvUVFZ84ds" aggregation="aggregate" type="ntefL6x2Ab2r" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="k0CmczNLU51e" aggregation="none" type="REhCQm4MOB01" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="cRtvUVFZ84ds" type="ntefL6x2Ab2r" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="k0CmczNLU51e" type="REhCQm4MOB01" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="y8PAxnHdWHgm" isRoot="false" isAbstract="false" name="TaskCalendar" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="y8PAxnHdWHgm" name="TaskCalendar" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="NVNl6sBm5XfV" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Generalization isSpecification="false" child="y8PAxnHdWHgm" visibility="public" namespace="Logical View" xmi.id="NVNl6sBm5XfV" parent="ntefL6x2Ab2r" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="zsUUFYvSH4J1" name="machineTaskCalendar" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="y8PAxnHdWHgm" xmi.id="NVNl6sBm5XfV" parent="ntefL6x2Ab2r" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="zsUUFYvSH4J1" name="machineTaskCalendar" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="62hE7K6rJGct" aggregation="none" type="oRwdH97rBGn9" name="" multiplicity="1" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="GxFi3GMwjKb1" aggregation="none" type="y8PAxnHdWHgm" name="" multiplicity="0-1" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" multiplicity="1" xmi.id="62hE7K6rJGct" type="oRwdH97rBGn9" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="0-1" xmi.id="GxFi3GMwjKb1" type="y8PAxnHdWHgm" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="mt22yJ3s6tKb" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="mt22yJ3s6tKb" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="ZMvDwiL2k3Gp" aggregation="none" type="oRwdH97rBGn9" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="LKfcbFUpCjVD" aggregation="none" type="y8PAxnHdWHgm" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="ZMvDwiL2k3Gp" type="oRwdH97rBGn9" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="LKfcbFUpCjVD" type="y8PAxnHdWHgm" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="MwHQnc1Dm9HN" name="workerTaskCalendar" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="MwHQnc1Dm9HN" name="workerTaskCalendar" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="xqAeAlfi5Yvz" aggregation="none" type="oRwdH97rBGn9" name="" multiplicity="1" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="EF0yIGmbZRCA" aggregation="none" type="y8PAxnHdWHgm" name="" multiplicity="0-1" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" multiplicity="1" xmi.id="xqAeAlfi5Yvz" type="oRwdH97rBGn9" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="0-1" xmi.id="EF0yIGmbZRCA" type="y8PAxnHdWHgm" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="KnonRVuLZaF6" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="KnonRVuLZaF6" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="egxqPS4KIEyR" aggregation="none" type="QuCpOvJF0Q5L" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="xb9074zLHzHX" aggregation="none" type="pWd0kqSVARYy" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="egxqPS4KIEyR" type="QuCpOvJF0Q5L" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="xb9074zLHzHX" type="pWd0kqSVARYy" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="zIPqKcZ2wTbx" isRoot="false" isAbstract="false" name="date" />
-      <UML:Class stereotype="abstract" isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="p0MFA2reS51l" isRoot="false" isAbstract="true" name="IHoursGroup" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="zIPqKcZ2wTbx" name="date" />
+      <UML:Class stereotype="abstract" visibility="public" isSpecification="false" namespace="Logical View" isAbstract="true" isLeaf="false" isRoot="false" xmi.id="p0MFA2reS51l" name="IHoursGroup" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="5wQLIioJnLvc" type="B2K2UzfVI9Wi" name="resourceType" />
-        <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="zSek5eMrL0wG" isRoot="false" isAbstract="false" isQuery="false" name="getWorkingHours" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="5wQLIioJnLvc" type="B2K2UzfVI9Wi" name="resourceType" />
+        <UML:Operation visibility="public" isSpecification="false" isQuery="false" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="zSek5eMrL0wG" name="getWorkingHours" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="ngRlWEM6jFtb" isRoot="false" isAbstract="false" name="AgregatedHoursGroup" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="ngRlWEM6jFtb" name="AgregatedHoursGroup" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="g1UEqY7k70EI" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Generalization isSpecification="false" child="aDjWeslUEANx" visibility="public" namespace="Logical View" xmi.id="QVL8zwMkOYp4" parent="p0MFA2reS51l" discriminator="" name="" />
-      <UML:Generalization isSpecification="false" child="ngRlWEM6jFtb" visibility="public" namespace="Logical View" xmi.id="g1UEqY7k70EI" parent="p0MFA2reS51l" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="dmnwejlnVE0w" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="aDjWeslUEANx" xmi.id="QVL8zwMkOYp4" parent="p0MFA2reS51l" name="" />
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="ngRlWEM6jFtb" xmi.id="g1UEqY7k70EI" parent="p0MFA2reS51l" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="dmnwejlnVE0w" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="OtVNjQjzNNYY" aggregation="none" type="tuIzeslDqJW5" name="" multiplicity="1" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="zWcAdiUnl5Em" aggregation="none" type="p0MFA2reS51l" name="" multiplicity="0..*" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" multiplicity="1" xmi.id="OtVNjQjzNNYY" type="tuIzeslDqJW5" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="0..*" xmi.id="zWcAdiUnl5Em" type="p0MFA2reS51l" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="PVKQQAmbSJET" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="PVKQQAmbSJET" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="0AzyGzMesp0b" aggregation="none" type="p0MFA2reS51l" name="" multiplicity="0..*" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Dhba5764eiDF" aggregation="none" type="pXwBgpXvFPTv" name="" multiplicity="0..*" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" multiplicity="0..*" xmi.id="0AzyGzMesp0b" type="p0MFA2reS51l" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="0..*" xmi.id="Dhba5764eiDF" type="pXwBgpXvFPTv" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="4OdWgrxuRQTt" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="4OdWgrxuRQTt" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Of2AlEulNuhd" aggregation="aggregate" type="ngRlWEM6jFtb" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="t1FkrFL4xud2" aggregation="none" type="aDjWeslUEANx" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="Of2AlEulNuhd" type="ngRlWEM6jFtb" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="t1FkrFL4xud2" type="aDjWeslUEANx" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Generalization isSpecification="false" child="P0toAiR6U083" visibility="public" namespace="Logical View" xmi.id="B2K2UzfVI9Wi" parent="9m8Qj7mNVHWt" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="zg1HpXzSx1uP" name="" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="P0toAiR6U083" xmi.id="B2K2UzfVI9Wi" parent="9m8Qj7mNVHWt" name="" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="zg1HpXzSx1uP" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="0j4cSFrqvsyg" aggregation="none" type="tuIzeslDqJW5" name="contains" multiplicity="0..*" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="4rRRl84c7IMy" aggregation="none" type="aDjWeslUEANx" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" multiplicity="0..*" xmi.id="0j4cSFrqvsyg" type="tuIzeslDqJW5" name="contains" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="4rRRl84c7IMy" type="aDjWeslUEANx" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="wt7gG0veBFYQ" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="wt7gG0veBFYQ" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="Xg1SYeSYLVAl" aggregation="none" type="tuIzeslDqJW5" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="k0afqYLuNkK8" aggregation="none" type="pXwBgpXvFPTv" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="Xg1SYeSYLVAl" type="tuIzeslDqJW5" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="k0afqYLuNkK8" type="pXwBgpXvFPTv" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="yJlPDdIdL0Bf" isRoot="false" isAbstract="false" name="Material" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="yJlPDdIdL0Bf" name="Material" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="qxvjCBO3js3F" />
        </UML:GeneralizableElement.generalization>
        <UML:Classifier.feature>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="pCWqnn3X4Cg1" type="2btmF8kaoYxY" name="description" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="Oy5plFJc06dX" type="BxRhMi93e0js" name="defaultUnitPrice" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="tKRurLs86uKm" type="6zMANtkSKpsl" name="materialCode" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="7DCwhDhGu9Ej" type="zeZIJDKDPOmx" name="disabled" />
-       </UML:Classifier.feature>
-      </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="Kj88Iy3nRzm8" isRoot="false" isAbstract="false" name="MaterialCategory" >
-=======
         <UML:Attribute visibility="private" isSpecification="false" xmi.id="pCWqnn3X4Cg1" type="2btmF8kaoYxY" name="description" />
         <UML:Attribute visibility="private" isSpecification="false" xmi.id="Oy5plFJc06dX" type="BxRhMi93e0js" name="defaultUnitPrice" />
         <UML:Attribute visibility="private" isSpecification="false" xmi.id="tKRurLs86uKm" type="6zMANtkSKpsl" name="materialCode" />
         <UML:Attribute visibility="private" isSpecification="false" xmi.id="7DCwhDhGu9Ej" type="zeZIJDKDPOmx" name="disabled" />
-        <UML:Attribute visibility="private" isSpecification="false" xmi.id="5j56B1zW2E4a" type="aLKUHshDOB1E" name="unitType" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="20d1uHuSZRvw" type="aLKUHshDOB1E" name="unitType" />
        </UML:Classifier.feature>
       </UML:Class>
       <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Kj88Iy3nRzm8" name="MaterialCategory" >
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="jhHQcmVMAoTd" />
        </UML:GeneralizableElement.generalization>
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="o6ZpgY0xw6ij" type="6zMANtkSKpsl" name="name" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="o6ZpgY0xw6ij" type="6zMANtkSKpsl" name="name" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="4trT6VkioirU" isRoot="false" isAbstract="false" name="MaterialAssignment" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="4trT6VkioirU" name="MaterialAssignment" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="57lb10WsuoNN" type="dCHs9h07Z9Vb" name="units" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="BLKrD3ScMKE3" type="BxRhMi93e0js" name="unitPrice" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="6NZ5N5yFrLcO" type="BxRhMi93e0js" name="totalPrice" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="5fZRzQe2qGOA" type="zIPqKcZ2wTbx" name="estimatedAvailability" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="9yjzD58eV31s" type="aLKUHshDOB1E" name="status" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="57lb10WsuoNN" type="dCHs9h07Z9Vb" name="units" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="BLKrD3ScMKE3" type="BxRhMi93e0js" name="unitPrice" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="6NZ5N5yFrLcO" type="BxRhMi93e0js" name="totalPrice" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="5fZRzQe2qGOA" type="zIPqKcZ2wTbx" name="estimatedAvailability" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="9yjzD58eV31s" type="aLKUHshDOB1E" name="status" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="qYAdxAN3lklc" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="qYAdxAN3lklc" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="xj8fcjt8odzM" aggregation="aggregate" type="tuIzeslDqJW5" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="YZePkc8TukXw" aggregation="none" type="4trT6VkioirU" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="xj8fcjt8odzM" type="tuIzeslDqJW5" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="YZePkc8TukXw" type="4trT6VkioirU" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="v7ZmQIcdpwvq" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="v7ZmQIcdpwvq" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="fioxcbuYK0Bu" aggregation="composite" type="tuIzeslDqJW5" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="j42XfzrCXWbH" aggregation="none" type="4trT6VkioirU" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="fioxcbuYK0Bu" type="tuIzeslDqJW5" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="j42XfzrCXWbH" type="4trT6VkioirU" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Generalization isSpecification="false" child="Kj88Iy3nRzm8" visibility="public" namespace="Logical View" xmi.id="jhHQcmVMAoTd" parent="byxyj0hGxJuG" discriminator="" name="" />
-      <UML:Generalization isSpecification="false" child="yJlPDdIdL0Bf" visibility="public" namespace="Logical View" xmi.id="qxvjCBO3js3F" parent="byxyj0hGxJuG" discriminator="" name="" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="RtFuFc3ITvWa" name="" >
-       <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="8kk2UFy9yl7a" aggregation="none" type="4trT6VkioirU" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Mz8ezJYjLZEz" aggregation="none" type="byxyj0hGxJuG" name="" />
-       </UML:Association.connection>
-      </UML:Association>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="BU8OtfasnvpG" name="" >
-       <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="W6B3cmKiW2ly" aggregation="none" type="tuIzeslDqJW5" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Ih6EQBokAvM9" aggregation="none" type="CzdNEBmDsnGX" name="" />
-=======
       <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="Kj88Iy3nRzm8" xmi.id="jhHQcmVMAoTd" parent="byxyj0hGxJuG" name="" />
       <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="yJlPDdIdL0Bf" xmi.id="qxvjCBO3js3F" parent="byxyj0hGxJuG" name="" />
       <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="RtFuFc3ITvWa" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="GENd7INMAxYw" type="4trT6VkioirU" name="" aggregation="none" />
-        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="FutuKXUkOheb" type="byxyj0hGxJuG" name="" aggregation="none" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="8kk2UFy9yl7a" type="4trT6VkioirU" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="Mz8ezJYjLZEz" type="byxyj0hGxJuG" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="PGYCCNTyF7TI" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="BU8OtfasnvpG" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="CvqWS5Vy9g2l" aggregation="none" type="CzdNEBmDsnGX" name="" multiplicity="*" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="SKRxLCtdszpG" aggregation="none" type="pXwBgpXvFPTv" name="" multiplicity="1..1" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="W6B3cmKiW2ly" type="tuIzeslDqJW5" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="Ih6EQBokAvM9" type="CzdNEBmDsnGX" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="Bp3OuXhiSD9V" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="PGYCCNTyF7TI" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="AdzKWLSjEIDg" aggregation="none" type="aDjWeslUEANx" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="LifUMfDmxfhI" aggregation="none" type="CzdNEBmDsnGX" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" multiplicity="*" xmi.id="CvqWS5Vy9g2l" type="CzdNEBmDsnGX" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1..1" xmi.id="SKRxLCtdszpG" type="pXwBgpXvFPTv" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="aLKUHshDOB1E" isRoot="false" isAbstract="false" name="enumeration" />
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="D90wRh3PO3aU" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="Bp3OuXhiSD9V" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="GTXTkk93QmWk" aggregation="none" type="4trT6VkioirU" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="PjXNMCdCnXpM" aggregation="none" type="yJlPDdIdL0Bf" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="AdzKWLSjEIDg" type="aDjWeslUEANx" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="LifUMfDmxfhI" type="CzdNEBmDsnGX" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="BOXlhkkKhFQH" name="" >
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="aLKUHshDOB1E" name="enumeration" />
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="D90wRh3PO3aU" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Dl5Xe6MtYtMG" aggregation="aggregate" type="Kj88Iy3nRzm8" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="cVJ0GplfXG0r" aggregation="none" type="byxyj0hGxJuG" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="GTXTkk93QmWk" type="4trT6VkioirU" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="PjXNMCdCnXpM" type="yJlPDdIdL0Bf" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="vwyANGEvohUR" name="parent" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="BOXlhkkKhFQH" name="" >
        <UML:Association.connection>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="Se1E9raMcfuF" aggregation="none" type="Kj88Iy3nRzm8" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="jG8F7UVjxnkD" aggregation="none" type="Kj88Iy3nRzm8" name="" />
-=======
-        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="6aaSYdIKtbur" type="Kj88Iy3nRzm8" name="" aggregation="aggregate" />
-        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="gVPpIYzRwXDe" type="byxyj0hGxJuG" name="" aggregation="none" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="Dl5Xe6MtYtMG" type="Kj88Iy3nRzm8" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="cVJ0GplfXG0r" type="byxyj0hGxJuG" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="zLpn2HDx3TTf" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="vwyANGEvohUR" name="parent" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="aTr5jrx9VyNe" aggregation="aggregate" type="Kj88Iy3nRzm8" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="px1QctfK7nZE" aggregation="none" type="yJlPDdIdL0Bf" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="Se1E9raMcfuF" type="Kj88Iy3nRzm8" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="jG8F7UVjxnkD" type="Kj88Iy3nRzm8" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="zeZIJDKDPOmx" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="zLpn2HDx3TTf" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="F5yCqgOQ9FWq" aggregation="none" type="aDjWeslUEANx" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="6TzaRNCFKBfv" aggregation="none" type="CzdNEBmDsnGX" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="aTr5jrx9VyNe" type="Kj88Iy3nRzm8" name="" aggregation="aggregate" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="px1QctfK7nZE" type="yJlPDdIdL0Bf" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="fHdy8MZ11WOH" isRoot="false" isAbstract="false" name="StretchesFunction" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="zeZIJDKDPOmx" name="" >
+       <UML:Association.connection>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="F5yCqgOQ9FWq" type="aDjWeslUEANx" name="" aggregation="none" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="6TzaRNCFKBfv" type="CzdNEBmDsnGX" name="" aggregation="none" />
+       </UML:Association.connection>
+      </UML:Association>
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="fHdy8MZ11WOH" name="StretchesFunction" >
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="EAVqvWoYytW8" />
        </UML:GeneralizableElement.generalization>
       </UML:Class>
-      <UML:Generalization isSpecification="false" child="fHdy8MZ11WOH" visibility="public" namespace="Logical View" xmi.id="EAVqvWoYytW8" parent="o5mCGv6T0zJ1" discriminator="" name="" />
-      <UML:Class stereotype="&lt;&lt;value object>>" isSpecification="false" isLeaf="false" visibility="public" namespace="Logical View" xmi.id="bnaZf6fRQoTj" isRoot="false" isAbstract="false" name="Stretch" >
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="fHdy8MZ11WOH" xmi.id="EAVqvWoYytW8" parent="o5mCGv6T0zJ1" name="" />
+      <UML:Class stereotype="&lt;&lt;value object>>" visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="bnaZf6fRQoTj" name="Stretch" >
        <UML:Classifier.feature>
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="SPicE5o2Hbfu" type="VyGIwPHyTZLs" name="date" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="Yk3Hi7d1naTm" type="BxRhMi93e0js" name="lengthPercentage" />
-        <UML:Attribute isSpecification="false" visibility="private" xmi.id="eldwxH6Pgo2s" type="BxRhMi93e0js" name="amountWorkPercentage" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="SPicE5o2Hbfu" type="VyGIwPHyTZLs" name="date" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="Yk3Hi7d1naTm" type="BxRhMi93e0js" name="lengthPercentage" />
+        <UML:Attribute visibility="private" isSpecification="false" xmi.id="eldwxH6Pgo2s" type="BxRhMi93e0js" name="amountWorkPercentage" />
        </UML:Classifier.feature>
       </UML:Class>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="1ohWlZ53ziLw" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="1ohWlZ53ziLw" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="gx4p23rbpSAU" aggregation="composite" type="fHdy8MZ11WOH" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="WptvdKed9J7s" aggregation="none" type="fHdy8MZ11WOH" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="gx4p23rbpSAU" type="fHdy8MZ11WOH" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="WptvdKed9J7s" type="fHdy8MZ11WOH" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
-      <UML:Association isSpecification="false" visibility="public" namespace="Logical View" xmi.id="qDvqtHkZCoNC" name="" >
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="qDvqtHkZCoNC" name="" >
        <UML:Association.connection>
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="qEndex79k04M" aggregation="composite" type="fHdy8MZ11WOH" name="" />
-        <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="LizS16KrHDfA" aggregation="none" type="bnaZf6fRQoTj" name="" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="qEndex79k04M" type="fHdy8MZ11WOH" name="" aggregation="composite" />
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="LizS16KrHDfA" type="bnaZf6fRQoTj" name="" aggregation="none" />
        </UML:Association.connection>
       </UML:Association>
      </UML:Namespace.ownedElement>
      <XMI.extension xmi.extender="umbrello" >
       <diagrams>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-       <diagram snapgrid="0" showattsig="1" fillcolor="#ffff00" linewidth="0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1089" snapy="10" showatts="1" xmi.id="2Evn4eNdYwkg" documentation="" type="1" showops="1" showpackage="1" name="Task Planning" localid="" showstereotype="1" showscope="1" snapcsgrid="0" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="835" >
-=======
-       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="1" showstereotype="1" name="Task Planning" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="797" canvaswidth="1089" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="2Evn4eNdYwkg" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="0" snapy="10" linewidth="0" showattsig="1" showpubliconly="0" showpackage="1" showstereotype="1" name="Task Planning" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="797" canvaswidth="1143" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="2Evn4eNdYwkg" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
         <widgets>
-         <classwidget usesdiagramfillcolor="1" width="106" showattsigs="601" x="361" fillcolor="none" y="8" showopsigs="601" linewidth="none" height="56" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="P0toAiR6U083" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="135" showattsigs="601" x="413" fillcolor="#ffffc0" y="144" showopsigs="601" linewidth="none" height="152" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="tuIzeslDqJW5" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="1" width="125" showattsigs="601" x="361" fillcolor="none" y="84" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="9m8Qj7mNVHWt" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="1" width="81" showattsigs="601" x="516" fillcolor="none" y="11" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="l4f7vJlc79Qq" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="137" showattsigs="601" x="857" fillcolor="#ffffc0" y="198" showopsigs="601" linewidth="none" height="72" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="aDjWeslUEANx" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="1" width="73" showattsigs="601" x="1012" fillcolor="none" y="126" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="pXwBgpXvFPTv" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="133" showattsigs="601" x="220" fillcolor="#9cff99" y="343" showopsigs="601" linewidth="none" height="136" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="9JJu7hjphMwH" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="87" showattsigs="601" x="127" fillcolor="#adffa2" y="563" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="8A8KfC0gS3t4" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="134" showattsigs="601" x="367" fillcolor="#adffa2" y="554" showopsigs="601" linewidth="none" height="88" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="oRwdH97rBGn9" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="148" showattsigs="601" x="489" fillcolor="#c0ffc0" y="341" showopsigs="601" linewidth="none" height="72" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="rVN4DbRR2AJv" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <notewidget usesdiagramfillcolor="1" width="230" x="702" fillcolor="none" y="327" linewidth="none" height="151" usefillcolor="1" isinstance="0" xmi.id="j6nQ2fUEmIW5" text="Constraints:
-  (*) One dependency cannot have the origin and the end pointing to the same TaskElement
- (*) Cycles in dependencies have to be avoided." usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <notewidget usesdiagramfillcolor="1" width="218" x="0" fillcolor="none" y="7" linewidth="none" height="175" usefillcolor="1" isinstance="0" xmi.id="wprANKhEzeAv" text="An OrderElement planificable will have one or more TaskElement associated.
-
-An OrderElement not planificable will not have any TaskElement associated" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <notewidget usesdiagramfillcolor="1" width="159" x="141" fillcolor="none" y="653" linewidth="none" height="140" usefillcolor="1" isinstance="0" xmi.id="ecrV7cutG1DY" text="A TaskElement which is a milestone has not an OrderElement associated and has not a HoursGroup" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="1" width="111" showattsigs="601" x="52" fillcolor="none" y="362" showopsigs="601" linewidth="none" height="40" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="ntefL6x2Ab2r" showoperations="0" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="1" width="114" showattsigs="601" x="228" fillcolor="none" y="598" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="L7U64083ITM9" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="127" showattsigs="601" x="785" fillcolor="#ffffc0" y="123" drawascircle="0" showopsigs="601" linewidth="none" height="56" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="p0MFA2reS51l" showoperations="1" showpackage="1" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="149" showattsigs="601" x="648" fillcolor="#ffffc0" y="219" showopsigs="601" linewidth="none" height="28" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="ngRlWEM6jFtb" showoperations="1" showpackage="1" showscope="1" showstereotype="1" usesdiagramusefillcolor="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="none" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="361" showattsigs="601" y="8" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="106" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="P0toAiR6U083" showscope="1" height="56" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="413" showattsigs="601" y="144" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="135" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="tuIzeslDqJW5" showscope="1" height="152" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="361" showattsigs="601" y="84" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="125" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="9m8Qj7mNVHWt" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="516" showattsigs="601" y="11" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="81" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="l4f7vJlc79Qq" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="857" showattsigs="601" y="198" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="137" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="aDjWeslUEANx" showscope="1" height="72" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="1012" showattsigs="601" y="126" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="73" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="pXwBgpXvFPTv" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="220" showattsigs="601" y="343" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="133" isinstance="0" usefillcolor="1" fillcolor="#9cff99" xmi.id="9JJu7hjphMwH" showscope="1" height="136" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="127" showattsigs="601" y="563" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="87" isinstance="0" usefillcolor="1" fillcolor="#adffa2" xmi.id="8A8KfC0gS3t4" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="367" showattsigs="601" y="554" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="134" isinstance="0" usefillcolor="1" fillcolor="#adffa2" xmi.id="oRwdH97rBGn9" showscope="1" height="88" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="489" showattsigs="601" y="341" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="148" isinstance="0" usefillcolor="1" fillcolor="#c0ffc0" xmi.id="rVN4DbRR2AJv" showscope="1" height="72" showopsigs="601" />
+         <notewidget width="230" x="702" noteType="0" y="327" usesdiagramusefillcolor="1" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="151" linecolor="none" xmi.id="j6nQ2fUEmIW5" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="Constraints:&#xa;  (*) One dependency cannot have the origin and the end pointing to the same TaskElement&#xa; (*) Cycles in dependencies have to be avoided." />
+         <notewidget width="218" x="0" noteType="0" y="7" usesdiagramusefillcolor="1" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="175" linecolor="none" xmi.id="wprANKhEzeAv" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="An OrderElement planificable will have one or more TaskElement associated.&#xa;&#xa;An OrderElement not planificable will not have any TaskElement associated" />
+         <notewidget width="159" x="141" noteType="0" y="653" usesdiagramusefillcolor="1" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="140" linecolor="none" xmi.id="ecrV7cutG1DY" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="A TaskElement which is a milestone has not an OrderElement associated and has not a HoursGroup" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="0" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="52" showattsigs="601" y="362" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="111" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="ntefL6x2Ab2r" showscope="1" height="40" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="228" showattsigs="601" y="598" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="114" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="L7U64083ITM9" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="1" x="785" showattsigs="601" showstereotype="1" y="123" showattributes="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" drawascircle="0" width="127" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="p0MFA2reS51l" showscope="1" height="56" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="648" showattsigs="601" showstereotype="1" y="219" showattributes="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" width="149" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="ngRlWEM6jFtb" showscope="1" height="28" showopsigs="601" />
         </widgets>
         <messages/>
         <associations>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="tuIzeslDqJW5" widgetaid="9m8Qj7mNVHWt" xmi.id="th9P9NXUOrdg" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="9m8Qj7mNVHWt" linecolor="none" totalcounta="2" xmi.id="th9P9NXUOrdg" widgetbid="tuIzeslDqJW5" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="423" starty="116" />
+           <startpoint startx="458" starty="116" />
            <endpoint endx="458" endy="144" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="tuIzeslDqJW5" widgetaid="l4f7vJlc79Qq" xmi.id="C7h2uwZmyT9F" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="2" widgetaid="l4f7vJlc79Qq" linecolor="none" totalcounta="2" xmi.id="C7h2uwZmyT9F" widgetbid="tuIzeslDqJW5" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="556" starty="43" />
-           <endpoint endx="503" endy="144" />
+           <startpoint startx="516" starty="43" />
+           <endpoint endx="516" endy="144" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="3" indexa="2" totalcountb="4" indexb="1" linewidth="none" widgetbid="9JJu7hjphMwH" widgetaid="8A8KfC0gS3t4" xmi.id="ECeqpWy8psFU" type="500" linecolor="none" >
+         <assocwidget indexa="2" indexb="1" widgetaid="8A8KfC0gS3t4" linecolor="none" totalcounta="3" xmi.id="ECeqpWy8psFU" widgetbid="9JJu7hjphMwH" totalcountb="4" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="185" starty="563" />
-           <endpoint endx="253" endy="479" />
+           <startpoint startx="214" starty="563" />
+           <endpoint endx="220" endy="479" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="4" indexb="3" linewidth="none" widgetbid="9JJu7hjphMwH" widgetaid="oRwdH97rBGn9" xmi.id="PB91APUzEttp" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="3" widgetaid="oRwdH97rBGn9" linecolor="none" totalcounta="2" xmi.id="PB91APUzEttp" widgetbid="9JJu7hjphMwH" totalcountb="4" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="434" starty="554" />
-           <endpoint endx="319" endy="479" />
+           <startpoint startx="367" starty="554" />
+           <endpoint endx="353" endy="479" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="3" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="9JJu7hjphMwH" widgetaid="8A8KfC0gS3t4" xmi.id="q0K4uDt3Em1T" type="501" linecolor="none" >
+         <assocwidget indexa="1" indexb="2" widgetaid="8A8KfC0gS3t4" linecolor="none" totalcounta="3" xmi.id="q0K4uDt3Em1T" widgetbid="9JJu7hjphMwH" totalcountb="3" type="501" linewidth="none" >
           <linepath>
-           <startpoint startx="156" starty="563" />
-           <endpoint endx="220" endy="433" />
+           <startpoint startx="149" starty="563" />
+           <endpoint endx="220" endy="445" />
            <point x="149" y="445" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="4" indexb="3" linewidth="none" widgetbid="tuIzeslDqJW5" widgetaid="9JJu7hjphMwH" xmi.id="hbXtOYMKK9AU" type="503" linecolor="none" >
+         <assocwidget indexa="1" indexb="3" widgetaid="9JJu7hjphMwH" linecolor="none" totalcounta="2" xmi.id="hbXtOYMKK9AU" widgetbid="tuIzeslDqJW5" totalcountb="4" type="503" linewidth="none" >
           <linepath>
-           <startpoint startx="286" starty="343" />
-           <endpoint endx="413" endy="258" />
+           <startpoint startx="282" starty="343" />
+           <endpoint endx="413" endy="188" />
            <point x="282" y="188" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="32" x="247" fillcolor="none" y="321" linewidth="none" posttext="" role="701" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="4KDB5mOKpKUf" text="0..1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="32" x="376" fillcolor="none" y="192" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="0s477axC1wmQ" text="0..1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="32" x="247" y="321" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="wV5vbgTsnziB" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..1" pretext="" />
-          <floatingtext width="32" x="376" y="192" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="Y3ShtJPriprq" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..1" pretext="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="32" x="247" y="321" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="hUQPMJ2SulDT" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..1" pretext="" />
+          <floatingtext width="32" x="376" y="192" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="53oVVmr1yaAF" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..1" pretext="" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="aDjWeslUEANx" widgetaid="oRwdH97rBGn9" xmi.id="0fgpKmKdgy1V" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="oRwdH97rBGn9" linecolor="none" totalcounta="2" xmi.id="0fgpKmKdgy1V" widgetbid="aDjWeslUEANx" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="501" starty="598" />
-           <endpoint endx="925" endy="270" />
+           <startpoint startx="501" starty="599" />
+           <endpoint endx="969" endy="270" />
            <point x="969" y="599" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="90" x="796" fillcolor="none" y="627" linewidth="none" posttext="" role="703" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="HyfcAIVCaiMf" text="descompose" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="34" x="534" fillcolor="none" y="569" linewidth="none" posttext="" role="701" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="SkzI4Uv2Kz7S" text="1..N" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="31" x="1009" fillcolor="none" y="274" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="X4eWyOxGMaqU" text="0..*" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="90" x="796" y="627" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="wwIJGaCA3H6e" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="descompose" pretext="" />
-          <floatingtext width="34" x="534" y="569" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="vZVjYBs4CIl3" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..N" pretext="" />
-          <floatingtext width="31" x="1009" y="274" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="b8uHwj7sgN9u" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="90" x="796" y="627" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="twCcCdjr78GU" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="descompose" pretext="" />
+          <floatingtext width="34" x="534" y="569" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="RIuJ15m66Zbb" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..N" pretext="" />
+          <floatingtext width="31" x="1009" y="274" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="LSaH0kWsegUq" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" linewidth="none" widgetbid="rVN4DbRR2AJv" widgetaid="j6nQ2fUEmIW5" roleBdoc="" documentation="" roleAdoc="" type="513" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+         <assocwidget indexa="1" indexb="1" visibilityA="0" widgetaid="j6nQ2fUEmIW5" visibilityB="0" roleBdoc="" roleAdoc="" linecolor="none" changeabilityA="900" totalcounta="2" changeabilityB="900" widgetbid="rVN4DbRR2AJv" totalcountb="2" type="513" documentation="" linewidth="none" >
           <linepath>
-           <startpoint startx="702" starty="402" />
+           <startpoint startx="702" starty="377" />
            <endpoint endx="637" endy="377" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="4" indexb="1" linewidth="none" widgetbid="tuIzeslDqJW5" widgetaid="9m8Qj7mNVHWt" xmi.id="7WR6rrQFg8vU" type="501" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="9m8Qj7mNVHWt" linecolor="none" totalcounta="2" xmi.id="7WR6rrQFg8vU" widgetbid="tuIzeslDqJW5" totalcountb="4" type="501" linewidth="none" >
           <linepath>
-           <startpoint startx="361" starty="100" />
-           <endpoint endx="413" endy="182" />
+           <startpoint startx="361" starty="92" />
+           <endpoint endx="413" endy="144" />
            <point x="328" y="92" />
            <point x="337" y="144" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="9m8Qj7mNVHWt" widgetaid="P0toAiR6U083" xmi.id="B2K2UzfVI9Wi" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="P0toAiR6U083" linecolor="none" totalcounta="2" xmi.id="B2K2UzfVI9Wi" widgetbid="9m8Qj7mNVHWt" totalcountb="2" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="414" starty="64" />
+           <startpoint startx="423" starty="64" />
            <endpoint endx="423" endy="84" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="9JJu7hjphMwH" widgetaid="rVN4DbRR2AJv" xmi.id="1DEsmgrxxgMG" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="rVN4DbRR2AJv" linecolor="none" totalcounta="2" xmi.id="1DEsmgrxxgMG" widgetbid="9JJu7hjphMwH" totalcountb="3" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="489" starty="377" />
+           <startpoint startx="489" starty="388" />
            <endpoint endx="353" endy="388" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="45" x="408" fillcolor="none" y="363" linewidth="none" posttext="" role="703" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="tJhTz17Rl4jn" text="origin" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="31" x="457" fillcolor="none" y="358" linewidth="none" posttext="" role="701" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="WfprcuJAyvgu" text="0..*" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="32" x="363" fillcolor="none" y="386" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="Hb8bAw61FlSE" text="1..1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="45" x="408" y="363" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="xJ50YBdUk6BG" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="origin" pretext="" />
-          <floatingtext width="31" x="457" y="358" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="F3KRK3UvBND7" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
-          <floatingtext width="32" x="363" y="386" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="4Iykg7fbRkaz" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="45" x="408" y="363" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="JChPKxrjDj2E" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="origin" pretext="" />
+          <floatingtext width="31" x="457" y="358" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="onJuKuTfL3wL" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
+          <floatingtext width="32" x="363" y="386" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="lRBP5gFPqum8" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="9JJu7hjphMwH" widgetaid="rVN4DbRR2AJv" xmi.id="F6WCnsRVBR2k" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="2" widgetaid="rVN4DbRR2AJv" linecolor="none" totalcounta="2" xmi.id="F6WCnsRVBR2k" widgetbid="9JJu7hjphMwH" totalcountb="3" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="563" starty="413" />
-           <endpoint endx="353" endy="433" />
+           <startpoint startx="546" starty="413" />
+           <endpoint endx="353" endy="428" />
            <point x="546" y="428" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="81" x="441" fillcolor="none" y="432" linewidth="none" posttext="" role="703" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="mZeVeNGA031b" text="destination" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="31" x="560" fillcolor="none" y="416" linewidth="none" posttext="" role="701" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="xIlvBPnSzw49" text="0..*" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="32" x="366" fillcolor="none" y="426" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="s8A6rcIbCw6o" text="1..1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="81" x="441" y="432" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="tBRbFcrUeBty" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="destination" pretext="" />
-          <floatingtext width="31" x="560" y="416" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="CLrLi2RnLPVz" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
-          <floatingtext width="32" x="366" y="426" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="WAavs8tjJKKY" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="81" x="441" y="432" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="pdr0KrE8eV0w" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="destination" pretext="" />
+          <floatingtext width="31" x="560" y="416" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="QTbjUW4FxGc0" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
+          <floatingtext width="32" x="366" y="426" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="upPkj9qWkhW4" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
          </assocwidget>
-         <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="ntefL6x2Ab2r" widgetaid="9JJu7hjphMwH" xmi.id="lyv5tS6Uncy0" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="9JJu7hjphMwH" linecolor="none" totalcounta="3" xmi.id="lyv5tS6Uncy0" widgetbid="ntefL6x2Ab2r" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="220" starty="388" />
+           <startpoint startx="220" starty="382" />
            <endpoint endx="163" endy="382" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="4" indexb="2" linewidth="none" widgetbid="9JJu7hjphMwH" widgetaid="L7U64083ITM9" xmi.id="bmmZXzV3Bv4h" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="2" widgetaid="L7U64083ITM9" linecolor="none" totalcounta="2" xmi.id="bmmZXzV3Bv4h" widgetbid="9JJu7hjphMwH" totalcountb="4" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="285" starty="598" />
+           <startpoint startx="286" starty="598" />
            <endpoint endx="286" endy="479" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" linewidth="none" widgetbid="L7U64083ITM9" widgetaid="ecrV7cutG1DY" roleBdoc="" documentation="" roleAdoc="" type="513" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+         <assocwidget indexa="1" indexb="1" visibilityA="0" widgetaid="ecrV7cutG1DY" visibilityB="0" roleBdoc="" roleAdoc="" linecolor="none" changeabilityA="900" totalcounta="2" changeabilityB="900" widgetbid="L7U64083ITM9" totalcountb="2" type="513" documentation="" linewidth="none" >
           <linepath>
-           <startpoint startx="220" starty="653" />
+           <startpoint startx="285" starty="653" />
            <endpoint endx="285" endy="630" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="4" indexa="2" visibilityB="200" totalcountb="2" indexb="1" linewidth="none" widgetbid="wprANKhEzeAv" widgetaid="tuIzeslDqJW5" roleBdoc="" documentation="" roleAdoc="" type="513" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+         <assocwidget indexa="2" indexb="1" visibilityA="0" widgetaid="tuIzeslDqJW5" visibilityB="0" roleBdoc="" roleAdoc="" linecolor="none" changeabilityA="900" totalcounta="4" changeabilityB="900" widgetbid="wprANKhEzeAv" totalcountb="2" type="513" documentation="" linewidth="none" >
           <linepath>
-           <startpoint startx="413" starty="220" />
-           <endpoint endx="218" endy="94" />
+           <startpoint startx="413" starty="144" />
+           <endpoint endx="218" endy="144" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="p0MFA2reS51l" widgetaid="aDjWeslUEANx" xmi.id="QVL8zwMkOYp4" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="2" widgetaid="aDjWeslUEANx" linecolor="none" totalcounta="2" xmi.id="QVL8zwMkOYp4" widgetbid="p0MFA2reS51l" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="925" starty="198" />
+           <startpoint startx="869" starty="198" />
            <endpoint endx="869" endy="179" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="p0MFA2reS51l" widgetaid="ngRlWEM6jFtb" xmi.id="g1UEqY7k70EI" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="ngRlWEM6jFtb" linecolor="none" totalcounta="2" xmi.id="g1UEqY7k70EI" widgetbid="p0MFA2reS51l" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="722" starty="219" />
-           <endpoint endx="827" endy="179" />
+           <startpoint startx="797" starty="219" />
+           <endpoint endx="797" endy="179" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="p0MFA2reS51l" widgetaid="tuIzeslDqJW5" xmi.id="dmnwejlnVE0w" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="tuIzeslDqJW5" linecolor="none" totalcounta="2" xmi.id="dmnwejlnVE0w" widgetbid="p0MFA2reS51l" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="548" starty="220" />
+           <startpoint startx="548" starty="151" />
            <endpoint endx="785" endy="151" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="15" x="550" fillcolor="none" y="124" linewidth="none" posttext="" role="701" height="18" usefillcolor="1" pretext="" isinstance="0" xmi.id="IMyIPytMGcFQ" showstereotype="1" text="1" usesdiagramusefillcolor="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="29" x="754" fillcolor="none" y="124" linewidth="none" posttext="" role="702" height="18" usefillcolor="1" pretext="" isinstance="0" xmi.id="02szwu6n2Gtt" showstereotype="1" text="0..*" usesdiagramusefillcolor="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="550" showstereotype="1" y="124" text="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" pretext="" role="701" width="15" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="vB0XKtVWDKsv" height="18" />
-          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="754" showstereotype="1" y="124" text="0..*" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" pretext="" role="702" width="29" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="NJgigChAKF6B" height="18" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="550" showstereotype="1" y="124" text="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" pretext="" role="701" width="15" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="YiCBEA7cdhL5" height="18" />
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="754" showstereotype="1" y="124" text="0..*" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" pretext="" role="702" width="29" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="BNI6bu6TjUBQ" height="18" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="pXwBgpXvFPTv" widgetaid="p0MFA2reS51l" xmi.id="PVKQQAmbSJET" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="p0MFA2reS51l" linecolor="none" totalcounta="2" xmi.id="PVKQQAmbSJET" widgetbid="pXwBgpXvFPTv" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="912" starty="151" />
+           <startpoint startx="912" starty="142" />
            <endpoint endx="1012" endy="142" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="29" x="914" fillcolor="none" y="117" linewidth="none" posttext="" role="701" height="18" usefillcolor="1" pretext="" isinstance="0" xmi.id="sBS28YqQsngF" showstereotype="1" text="0..*" usesdiagramusefillcolor="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="29" x="981" fillcolor="none" y="117" linewidth="none" posttext="" role="702" height="18" usefillcolor="1" pretext="" isinstance="0" xmi.id="lYZz8oP8pI5j" showstereotype="1" text="0..*" usesdiagramusefillcolor="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="914" showstereotype="1" y="117" text="0..*" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" pretext="" role="701" width="29" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="OzuhJFECQCjj" height="18" />
-          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="981" showstereotype="1" y="117" text="0..*" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" pretext="" role="702" width="29" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="4CDHX5CuMra0" height="18" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="914" showstereotype="1" y="117" text="0..*" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" pretext="" role="701" width="29" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="d1wOiQQF9bON" height="18" />
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="981" showstereotype="1" y="117" text="0..*" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" pretext="" role="702" width="29" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="lTxNAISLdlPF" height="18" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="aDjWeslUEANx" widgetaid="ngRlWEM6jFtb" xmi.id="4OdWgrxuRQTt" type="501" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="ngRlWEM6jFtb" linecolor="none" totalcounta="2" xmi.id="4OdWgrxuRQTt" widgetbid="aDjWeslUEANx" totalcountb="2" type="501" linewidth="none" >
           <linepath>
-           <startpoint startx="797" starty="233" />
+           <startpoint startx="797" starty="234" />
            <endpoint endx="857" endy="234" />
           </linepath>
          </assocwidget>
         </associations>
        </diagram>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-       <diagram snapgrid="0" showattsig="1" fillcolor="#ffff00" linewidth="0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="954" snapy="10" showatts="1" xmi.id="em0PEuZNPWBl" documentation="" type="1" showops="1" showpackage="1" name="Resources Allocation" localid="" showstereotype="1" showscope="1" snapcsgrid="0" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="835" >
-=======
-       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="1" showstereotype="1" name="Resources Allocation" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="557" canvaswidth="835" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="em0PEuZNPWBl" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="0" snapy="10" linewidth="0" showattsig="1" showpubliconly="0" showpackage="1" showstereotype="1" name="Resources Allocation" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="600" canvaswidth="1160" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="em0PEuZNPWBl" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
         <widgets>
-         <classwidget usesdiagramfillcolor="0" width="134" showattsigs="601" x="201" fillcolor="#ffffc0" y="181" showopsigs="601" linewidth="none" height="88" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="oRwdH97rBGn9" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="150" showattsigs="601" x="407" fillcolor="#92ff88" y="206" showopsigs="601" linewidth="none" height="40" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="xC9oqvTbtqno" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="207" showattsigs="601" x="376" fillcolor="#a8ff97" y="315" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="zOVY0BwVHuvE" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <notewidget usesdiagramfillcolor="1" width="137" x="471" fillcolor="none" y="20" linewidth="none" height="137" usefillcolor="1" isinstance="0" xmi.id="PFaYRnK1tp0B" text="The assigment is going to be from the startDate to the endDate of the task" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="1" width="152" showattsigs="601" x="682" fillcolor="none" y="31" showopsigs="601" linewidth="none" height="36" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="o5mCGv6T0zJ1" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="215" showattsigs="601" x="28" fillcolor="#ffffc0" y="304" showopsigs="601" linewidth="none" height="56" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="YpNtsZci2NR9" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <notewidget usesdiagramfillcolor="1" width="190" x="207" fillcolor="none" y="31" linewidth="none" height="127" usefillcolor="1" isinstance="0" xmi.id="q8fcVDfvP5R3" text="The percentage indicates in the case of an AssigmentFunction the maximum value to calculate the days assigments
-" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="206" showattsigs="601" x="618" fillcolor="#ffffc0" y="312" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="ip8LnfNpfMJo" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="1" width="73" showattsigs="601" x="716" fillcolor="none" y="452" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="pXwBgpXvFPTv" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="1" width="171" showattsigs="601" x="209" fillcolor="none" y="521" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="0WUme5I6QUAL" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="1" width="180" showattsigs="601" x="248" fillcolor="none" y="418" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="F56Fpf6oVy2F" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <notewidget usesdiagramfillcolor="1" width="111" x="17" fillcolor="none" y="120" linewidth="none" height="105" usefillcolor="1" isinstance="0" xmi.id="yILqbUuHiC8v" text="Hibernate hirachy to implement with only a table
-" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="1" width="78" showattsigs="601" x="280" fillcolor="none" y="316" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="QuCpOvJF0Q5L" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="127" showattsigs="601" x="721" fillcolor="#f47aff" y="134" showopsigs="601" linewidth="none" height="29" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="fHdy8MZ11WOH" showoperations="1" showpackage="1" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="DejaVu Sans,8,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="231" showattsigs="601" x="719" fillcolor="#fa6dff" y="198" showopsigs="601" linewidth="none" height="82" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="bnaZf6fRQoTj" showoperations="1" showpackage="1" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="DejaVu Sans,8,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="201" showattsigs="601" y="181" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="134" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="oRwdH97rBGn9" showscope="1" height="88" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="407" showattsigs="601" y="206" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="150" isinstance="0" usefillcolor="1" fillcolor="#92ff88" xmi.id="xC9oqvTbtqno" showscope="1" height="40" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="376" showattsigs="601" y="315" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="207" isinstance="0" usefillcolor="1" fillcolor="#a8ff97" xmi.id="zOVY0BwVHuvE" showscope="1" height="32" showopsigs="601" />
+         <notewidget width="137" x="471" noteType="0" y="20" usesdiagramusefillcolor="1" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="137" linecolor="none" xmi.id="PFaYRnK1tp0B" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="The assigment is going to be from the startDate to the endDate of the task" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="682" showattsigs="601" y="31" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="152" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="o5mCGv6T0zJ1" showscope="1" height="36" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="28" showattsigs="601" y="304" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="215" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="YpNtsZci2NR9" showscope="1" height="56" showopsigs="601" />
+         <notewidget width="190" x="207" noteType="0" y="31" usesdiagramusefillcolor="1" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="127" linecolor="none" xmi.id="q8fcVDfvP5R3" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="The percentage indicates in the case of an AssigmentFunction the maximum value to calculate the days assigments&#xa;" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="618" showattsigs="601" y="312" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="206" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="ip8LnfNpfMJo" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="716" showattsigs="601" y="452" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="73" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="pXwBgpXvFPTv" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="209" showattsigs="601" y="521" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="171" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="0WUme5I6QUAL" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="248" showattsigs="601" y="418" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="180" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="F56Fpf6oVy2F" showscope="1" height="32" showopsigs="601" />
+         <notewidget width="111" x="17" noteType="0" y="120" usesdiagramusefillcolor="1" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="105" linecolor="none" xmi.id="yILqbUuHiC8v" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="Hibernate hirachy to implement with only a table&#xa;" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="280" showattsigs="601" y="316" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="78" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="QuCpOvJF0Q5L" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="1" x="721" showattsigs="601" showstereotype="1" y="134" showattributes="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" width="127" isinstance="0" usefillcolor="1" fillcolor="#f47aff" xmi.id="fHdy8MZ11WOH" showscope="1" height="29" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="1" x="719" showattsigs="601" showstereotype="1" y="198" showattributes="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" width="231" isinstance="0" usefillcolor="1" fillcolor="#fa6dff" xmi.id="bnaZf6fRQoTj" showscope="1" height="82" showopsigs="601" />
         </widgets>
         <messages/>
         <associations>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="xC9oqvTbtqno" widgetaid="oRwdH97rBGn9" xmi.id="zjtlyOUtbbhP" type="510" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="oRwdH97rBGn9" linecolor="none" totalcounta="2" xmi.id="zjtlyOUtbbhP" widgetbid="xC9oqvTbtqno" totalcountb="2" type="510" linewidth="none" >
           <linepath>
-           <startpoint startx="335" starty="225" />
+           <startpoint startx="335" starty="226" />
            <endpoint endx="407" endy="226" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="xC9oqvTbtqno" widgetaid="zOVY0BwVHuvE" xmi.id="g8YcVjpn2tyC" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="zOVY0BwVHuvE" linecolor="none" totalcounta="2" xmi.id="g8YcVjpn2tyC" widgetbid="xC9oqvTbtqno" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="479" starty="315" />
+           <startpoint startx="457" starty="315" />
            <endpoint endx="457" endy="246" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="4" indexb="2" linewidth="none" widgetbid="xC9oqvTbtqno" widgetaid="PFaYRnK1tp0B" roleBdoc="" documentation="" roleAdoc="" type="513" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+         <assocwidget indexa="1" indexb="2" visibilityA="0" widgetaid="PFaYRnK1tp0B" visibilityB="0" roleBdoc="" roleAdoc="" linecolor="none" changeabilityA="900" totalcounta="2" changeabilityB="900" widgetbid="xC9oqvTbtqno" totalcountb="4" type="513" documentation="" linewidth="none" >
           <linepath>
-           <startpoint startx="539" starty="157" />
+           <startpoint startx="482" starty="157" />
            <endpoint endx="482" endy="206" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="4" indexb="1" linewidth="none" widgetbid="xC9oqvTbtqno" widgetaid="q8fcVDfvP5R3" roleBdoc="" documentation="" roleAdoc="" type="513" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+         <assocwidget indexa="1" indexb="1" visibilityA="0" widgetaid="q8fcVDfvP5R3" visibilityB="0" roleBdoc="" roleAdoc="" linecolor="none" changeabilityA="900" totalcounta="2" changeabilityB="900" widgetbid="xC9oqvTbtqno" totalcountb="4" type="513" documentation="" linewidth="none" >
           <linepath>
-           <startpoint startx="302" starty="158" />
-           <endpoint endx="444" endy="206" />
+           <startpoint startx="397" starty="158" />
+           <endpoint endx="407" endy="206" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="4" indexa="3" totalcountb="3" indexb="1" linewidth="none" widgetbid="o5mCGv6T0zJ1" widgetaid="xC9oqvTbtqno" xmi.id="mEGPrjbUf0X4" type="512" linecolor="none" >
+         <assocwidget indexa="3" indexb="1" widgetaid="xC9oqvTbtqno" linecolor="none" totalcounta="4" xmi.id="mEGPrjbUf0X4" widgetbid="o5mCGv6T0zJ1" totalcountb="3" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="519" starty="206" />
-           <endpoint endx="732" endy="67" />
+           <startpoint startx="557" starty="206" />
+           <endpoint endx="682" endy="67" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="xC9oqvTbtqno" widgetaid="ip8LnfNpfMJo" xmi.id="GvUkFUrye1Yl" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="2" widgetaid="ip8LnfNpfMJo" linecolor="none" totalcounta="2" xmi.id="GvUkFUrye1Yl" widgetbid="xC9oqvTbtqno" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="721" starty="312" />
-           <endpoint endx="507" endy="246" />
+           <startpoint startx="618" starty="312" />
+           <endpoint endx="557" endy="246" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="pXwBgpXvFPTv" widgetaid="0WUme5I6QUAL" xmi.id="EehA3r9cC9zf" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="0WUme5I6QUAL" linecolor="none" totalcounta="2" xmi.id="EehA3r9cC9zf" widgetbid="pXwBgpXvFPTv" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="380" starty="537" />
-           <endpoint endx="716" endy="468" />
+           <startpoint startx="380" starty="521" />
+           <endpoint endx="716" endy="484" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="3" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="YpNtsZci2NR9" widgetaid="0WUme5I6QUAL" xmi.id="c5awcauVaslZ" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="0WUme5I6QUAL" linecolor="none" totalcounta="3" xmi.id="c5awcauVaslZ" widgetbid="YpNtsZci2NR9" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="266" starty="521" />
-           <endpoint endx="99" endy="360" />
+           <startpoint startx="209" starty="521" />
+           <endpoint endx="209" endy="360" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="3" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="YpNtsZci2NR9" widgetaid="F56Fpf6oVy2F" xmi.id="E38AqfH4iLJV" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="2" widgetaid="F56Fpf6oVy2F" linecolor="none" totalcounta="3" xmi.id="E38AqfH4iLJV" widgetbid="YpNtsZci2NR9" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="308" starty="418" />
-           <endpoint endx="171" endy="360" />
+           <startpoint startx="248" starty="418" />
+           <endpoint endx="243" endy="360" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="F56Fpf6oVy2F" widgetaid="zOVY0BwVHuvE" xmi.id="fNiLi0qhO9Dg" type="501" linecolor="none" >
+         <assocwidget indexa="1" indexb="2" widgetaid="zOVY0BwVHuvE" linecolor="none" totalcounta="2" xmi.id="fNiLi0qhO9Dg" widgetbid="F56Fpf6oVy2F" totalcountb="3" type="501" linewidth="none" >
           <linepath>
-           <startpoint startx="479" starty="347" />
-           <endpoint endx="368" endy="418" />
+           <startpoint startx="376" starty="347" />
+           <endpoint endx="376" endy="418" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="3" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="0WUme5I6QUAL" widgetaid="ip8LnfNpfMJo" xmi.id="10mN8z3YuI93" type="501" linecolor="none" >
+         <assocwidget indexa="1" indexb="2" widgetaid="ip8LnfNpfMJo" linecolor="none" totalcounta="3" xmi.id="10mN8z3YuI93" widgetbid="0WUme5I6QUAL" totalcountb="3" type="501" linewidth="none" >
           <linepath>
-           <startpoint startx="686" starty="344" />
-           <endpoint endx="323" endy="521" />
+           <startpoint startx="618" starty="344" />
+           <endpoint endx="380" endy="521" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" linewidth="none" widgetbid="YpNtsZci2NR9" widgetaid="yILqbUuHiC8v" roleBdoc="" documentation="" roleAdoc="" type="513" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+         <assocwidget indexa="1" indexb="1" visibilityA="0" widgetaid="yILqbUuHiC8v" visibilityB="0" roleBdoc="" roleAdoc="" linecolor="none" changeabilityA="900" totalcounta="2" changeabilityB="900" widgetbid="YpNtsZci2NR9" totalcountb="2" type="513" documentation="" linewidth="none" >
           <linepath>
-           <startpoint startx="72" starty="225" />
-           <endpoint endx="135" endy="304" />
+           <startpoint startx="128" starty="225" />
+           <endpoint endx="128" endy="304" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="QuCpOvJF0Q5L" widgetaid="YpNtsZci2NR9" xmi.id="J8OHoCPSGkOw" type="503" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="YpNtsZci2NR9" linecolor="none" totalcounta="2" xmi.id="J8OHoCPSGkOw" widgetbid="QuCpOvJF0Q5L" totalcountb="2" type="503" linewidth="none" >
           <linepath>
            <startpoint startx="243" starty="332" />
            <endpoint endx="280" endy="332" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="zOVY0BwVHuvE" widgetaid="QuCpOvJF0Q5L" xmi.id="Z7WJUTzgGyya" type="503" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="QuCpOvJF0Q5L" linecolor="none" totalcounta="2" xmi.id="Z7WJUTzgGyya" widgetbid="zOVY0BwVHuvE" totalcountb="2" type="503" linewidth="none" >
           <linepath>
-           <startpoint startx="358" starty="332" />
+           <startpoint startx="358" starty="331" />
            <endpoint endx="376" endy="331" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="pXwBgpXvFPTv" widgetaid="ip8LnfNpfMJo" xmi.id="WAT4KbzXr4jk" type="501" linecolor="none" >
+         <assocwidget indexa="2" indexb="1" widgetaid="ip8LnfNpfMJo" linecolor="none" totalcounta="3" xmi.id="WAT4KbzXr4jk" widgetbid="pXwBgpXvFPTv" totalcountb="2" type="501" linewidth="none" >
           <linepath>
-           <startpoint startx="755" starty="344" />
+           <startpoint startx="752" starty="344" />
            <endpoint endx="752" endy="452" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="o5mCGv6T0zJ1" widgetaid="fHdy8MZ11WOH" xmi.id="EAVqvWoYytW8" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="2" widgetaid="fHdy8MZ11WOH" linecolor="none" totalcounta="2" xmi.id="EAVqvWoYytW8" widgetbid="o5mCGv6T0zJ1" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="784" starty="134" />
+           <startpoint startx="783" starty="134" />
            <endpoint endx="783" endy="67" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="bnaZf6fRQoTj" widgetaid="fHdy8MZ11WOH" xmi.id="qDvqtHkZCoNC" type="510" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="fHdy8MZ11WOH" linecolor="none" totalcounta="2" xmi.id="qDvqtHkZCoNC" widgetbid="bnaZf6fRQoTj" totalcountb="2" type="510" linewidth="none" >
           <linepath>
-           <startpoint startx="784" starty="163" />
+           <startpoint startx="834" starty="163" />
            <endpoint endx="834" endy="198" />
           </linepath>
          </assocwidget>
         </associations>
        </diagram>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-       <diagram snapgrid="0" showattsig="1" fillcolor="#ffff00" linewidth="0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1023" snapy="10" showatts="1" xmi.id="etxi1i1F785F" documentation="" type="1" showops="1" showpackage="1" name="Advances" localid="" showstereotype="1" showscope="1" snapcsgrid="0" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="851" >
+       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="0" snapy="10" linewidth="0" showattsig="1" showpubliconly="0" showpackage="1" showstereotype="1" name="Advances" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="665" canvaswidth="1160" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="etxi1i1F785F" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
         <widgets>
-         <classwidget usesdiagramfillcolor="1" width="135" showattsigs="601" x="24" fillcolor="none" y="198" showopsigs="601" linewidth="none" height="152" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="tuIzeslDqJW5" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,0,75,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="220" showattsigs="601" x="297" fillcolor="#71ff4a" y="245" showopsigs="601" linewidth="none" height="56" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="UwUp5iYgVB85" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="364" showattsigs="601" x="655" fillcolor="#ffffc0" y="223" showopsigs="601" linewidth="none" height="128" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="bmRPNtkrYrn4" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="173" showattsigs="601" x="156" fillcolor="#ffffc0" y="441" showopsigs="601" linewidth="none" height="56" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="QX7KUtq8V8Jy" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
-         <notewidget usesdiagramfillcolor="0" width="461" x="173" fillcolor="#b9fff7" y="19" linewidth="none" height="184" usefillcolor="1" isinstance="0" xmi.id="BRWpZJn9t6Gg" text="Hai que introducir a regra de negocio de que non pode haber dous obxectos AdvanceAssigment do mesmo AdvanceType sobre o OrderElement
-
-Tamen hai que introducir a restriccion de que non se pode definir un obxecto AdvanceAssigment sobre un OrderElement se existe algun pai deste OrderElement que ten un obxecto AdvanceAssigment do mesmo AdvanceType" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="193" showattsigs="601" x="146" fillcolor="#ffffc0" y="367" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="o5RjRxAkOrU1" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="1" width="205" showattsigs="601" x="387" fillcolor="none" y="367" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="KgJE71ZrTa4N" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,0,75,0,0,0,0,0" linecolor="none" />
-         <notewidget usesdiagramfillcolor="1" width="292" x="611" fillcolor="none" y="472" linewidth="none" height="189" usefillcolor="1" isinstance="0" xmi.id="zSuD3L47lpuA" text="Hai que crear un novo tipo de avance predefinido: ChildrenAdvanceType. Este tipo de avance se cargara se non existe na base de datos.  Ademais cando se cree un OrderElement de tipo OrderLineGroup haberá sempre que crearlle un IndirectAdvanceAssigment de tipo ChildrenAdvanceType" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" />
-=======
-       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="1" showstereotype="1" name="Advances" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="665" canvaswidth="1023" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="etxi1i1F785F" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
-        <widgets>
-         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="24" showattsigs="601" y="198" showattributes="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" width="135" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="tuIzeslDqJW5" showscope="1" height="152" showopsigs="601" />
-         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="297" showattsigs="601" y="245" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="220" isinstance="0" usefillcolor="1" fillcolor="#71ff4a" xmi.id="UwUp5iYgVB85" showscope="1" height="56" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="24" showattsigs="601" y="198" showattributes="1" font="Sans Serif,10,-1,0,75,0,0,0,0,0" width="135" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="tuIzeslDqJW5" showscope="1" height="152" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="297" showattsigs="601" y="245" showattributes="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" width="220" isinstance="0" usefillcolor="1" fillcolor="#71ff4a" xmi.id="UwUp5iYgVB85" showscope="1" height="56" showopsigs="601" />
          <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="655" showattsigs="601" y="223" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="364" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="bmRPNtkrYrn4" showscope="1" height="128" showopsigs="601" />
-         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="156" showattsigs="601" y="441" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="173" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="QX7KUtq8V8Jy" showscope="1" height="56" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="156" showattsigs="601" y="441" showattributes="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" width="173" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="QX7KUtq8V8Jy" showscope="1" height="56" showopsigs="601" />
          <notewidget width="461" x="173" noteType="0" y="19" usesdiagramusefillcolor="1" usesdiagramfillcolor="0" isinstance="0" fillcolor="#b9fff7" height="184" linecolor="none" xmi.id="BRWpZJn9t6Gg" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,0,50,0,0,0,0,0" text="Hai que introducir a regra de negocio de que non pode haber dous obxectos AdvanceAssigment do mesmo AdvanceType sobre o OrderElement&#xa;&#xa;Tamen hai que introducir a restriccion de que non se pode definir un obxecto AdvanceAssigment sobre un OrderElement se existe algun pai deste OrderElement que ten un obxecto AdvanceAssigment do mesmo AdvanceType" />
-         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="146" showattsigs="601" y="367" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="193" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="o5RjRxAkOrU1" showscope="1" height="32" showopsigs="601" />
-         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="387" showattsigs="601" y="367" showattributes="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" width="205" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="KgJE71ZrTa4N" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="146" showattsigs="601" y="367" showattributes="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" width="193" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="o5RjRxAkOrU1" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="387" showattsigs="601" y="367" showattributes="1" font="Sans Serif,10,-1,0,75,0,0,0,0,0" width="205" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="KgJE71ZrTa4N" showscope="1" height="32" showopsigs="601" />
          <notewidget width="292" x="611" noteType="0" y="472" usesdiagramusefillcolor="1" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="189" linecolor="none" xmi.id="zSuD3L47lpuA" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,0,50,0,0,0,0,0" text="Hai que crear un novo tipo de avance predefinido: ChildrenAdvanceType. Este tipo de avance se cargara se non existe na base de datos.  Ademais cando se cree un OrderElement de tipo OrderLineGroup haberá sempre que crearlle un IndirectAdvanceAssigment de tipo ChildrenAdvanceType" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
         </widgets>
         <messages/>
         <associations>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="UwUp5iYgVB85" widgetaid="tuIzeslDqJW5" xmi.id="ID5eRbJXppCu" type="510" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="tuIzeslDqJW5" linecolor="none" totalcounta="2" xmi.id="ID5eRbJXppCu" widgetbid="UwUp5iYgVB85" totalcountb="2" type="510" linewidth="none" >
           <linepath>
-           <startpoint startx="159" starty="274" />
+           <startpoint startx="159" starty="273" />
            <endpoint endx="297" endy="273" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="31" x="259" fillcolor="none" y="264" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="ABWDRP4IZXIf" text="0..*" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="31" x="259" y="264" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="sERYVgki4wRn" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="31" x="259" y="264" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="0sldtgza6QpD" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="bmRPNtkrYrn4" widgetaid="UwUp5iYgVB85" xmi.id="uvVTa3RmuzlY" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="UwUp5iYgVB85" linecolor="none" totalcounta="2" xmi.id="uvVTa3RmuzlY" widgetbid="bmRPNtkrYrn4" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="517" starty="273" />
+           <startpoint startx="517" starty="287" />
            <endpoint endx="655" endy="287" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="32" x="612" fillcolor="none" y="276" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="393wwj9fFjeO" text="1..1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="32" x="612" y="276" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="ye1F94Q1PHZP" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="32" x="612" y="276" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="zBakeV7nnY6P" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" linewidth="none" widgetbid="UwUp5iYgVB85" widgetaid="BRWpZJn9t6Gg" roleBdoc="" documentation="" roleAdoc="" type="513" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+         <assocwidget indexa="1" indexb="1" visibilityA="0" widgetaid="BRWpZJn9t6Gg" visibilityB="0" roleBdoc="" roleAdoc="" linecolor="none" changeabilityA="900" totalcounta="2" changeabilityB="900" widgetbid="UwUp5iYgVB85" totalcountb="2" type="513" documentation="" linewidth="none" >
           <linepath>
-           <startpoint startx="403" starty="203" />
+           <startpoint startx="407" starty="203" />
            <endpoint endx="407" endy="245" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="UwUp5iYgVB85" widgetaid="o5RjRxAkOrU1" xmi.id="t9QzWAWJNjCI" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="o5RjRxAkOrU1" linecolor="none" totalcounta="2" xmi.id="t9QzWAWJNjCI" widgetbid="UwUp5iYgVB85" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="242" starty="367" />
-           <endpoint endx="370" endy="301" />
+           <startpoint startx="339" starty="367" />
+           <endpoint endx="339" endy="301" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="UwUp5iYgVB85" widgetaid="KgJE71ZrTa4N" xmi.id="u0gIjsab6Z3N" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="2" widgetaid="KgJE71ZrTa4N" linecolor="none" totalcounta="2" xmi.id="u0gIjsab6Z3N" widgetbid="UwUp5iYgVB85" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="489" starty="367" />
+           <startpoint startx="443" starty="367" />
            <endpoint endx="443" endy="301" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="QX7KUtq8V8Jy" widgetaid="o5RjRxAkOrU1" xmi.id="IC1cnfMgnyr9" type="510" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="o5RjRxAkOrU1" linecolor="none" totalcounta="2" xmi.id="IC1cnfMgnyr9" widgetbid="QX7KUtq8V8Jy" totalcountb="2" type="510" linewidth="none" >
           <linepath>
            <startpoint startx="242" starty="399" />
            <endpoint endx="242" endy="441" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" linewidth="none" widgetbid="bmRPNtkrYrn4" widgetaid="zSuD3L47lpuA" roleBdoc="" documentation="" roleAdoc="" type="513" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+         <assocwidget indexa="1" indexb="1" visibilityA="0" widgetaid="zSuD3L47lpuA" visibilityB="0" roleBdoc="" roleAdoc="" linecolor="none" changeabilityA="900" totalcounta="2" changeabilityB="900" widgetbid="bmRPNtkrYrn4" totalcountb="2" type="513" documentation="" linewidth="none" >
           <linepath>
-           <startpoint startx="757" starty="472" />
+           <startpoint startx="837" starty="472" />
            <endpoint endx="837" endy="351" />
           </linepath>
          </assocwidget>
         </associations>
        </diagram>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-       <diagram snapgrid="0" showattsig="1" fillcolor="#ffff00" linewidth="0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="944" snapy="10" showatts="1" xmi.id="9fuEBXrUUlIu" documentation="" type="1" showops="1" showpackage="1" name="Labels" localid="" showstereotype="1" showscope="1" snapcsgrid="0" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="851" >
-=======
-       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="1" showstereotype="1" name="Labels" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="550" canvaswidth="824" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="9fuEBXrUUlIu" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="0" snapy="10" linewidth="0" showattsig="1" showpubliconly="0" showpackage="1" showstereotype="1" name="Labels" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="600" canvaswidth="1160" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="9fuEBXrUUlIu" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
         <widgets>
-         <classwidget usesdiagramfillcolor="1" width="135" showattsigs="601" x="135" fillcolor="none" y="108" showopsigs="601" linewidth="none" height="152" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="tuIzeslDqJW5" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="68" showattsigs="601" x="410" fillcolor="#ffffc0" y="167" showopsigs="601" linewidth="none" height="40" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="J8SsPhfYKZmW" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="82" showattsigs="601" x="605" fillcolor="#ffffc0" y="171" showopsigs="601" linewidth="none" height="40" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="4cyZLGRuFuQR" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <notewidget usesdiagramfillcolor="1" width="167" x="368" fillcolor="none" y="292" linewidth="none" height="121" usefillcolor="1" isinstance="0" xmi.id="4M4dK9M6XlQq" text="many-to-many relationship: It is probable that we have to navigate the association both sides." usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="135" showattsigs="601" y="108" showattributes="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" width="135" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="tuIzeslDqJW5" showscope="1" height="152" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="410" showattsigs="601" y="167" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="68" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="J8SsPhfYKZmW" showscope="1" height="40" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="605" showattsigs="601" y="171" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="82" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="4cyZLGRuFuQR" showscope="1" height="40" showopsigs="601" />
+         <notewidget width="167" x="368" noteType="0" y="292" usesdiagramusefillcolor="1" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="121" linecolor="none" xmi.id="4M4dK9M6XlQq" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="many-to-many relationship: It is probable that we have to navigate the association both sides." />
         </widgets>
         <messages/>
         <associations>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="J8SsPhfYKZmW" widgetaid="tuIzeslDqJW5" xmi.id="5PKYSxAl3acS" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="tuIzeslDqJW5" linecolor="none" totalcounta="2" xmi.id="5PKYSxAl3acS" widgetbid="J8SsPhfYKZmW" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="270" starty="184" />
+           <startpoint startx="270" starty="187" />
            <endpoint endx="410" endy="187" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="34" x="272" fillcolor="none" y="175" linewidth="none" posttext="" role="701" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="X4UKKa4UjahB" text="0..N" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="34" x="375" fillcolor="none" y="175" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="ykRXFjAIqDCm" text="0..N" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="34" x="272" y="175" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="KoYfIpC91dhX" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
-          <floatingtext width="34" x="375" y="175" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="HPFJJe7IG6VP" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="34" x="272" y="175" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="HWcu2IF2Azd4" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
+          <floatingtext width="34" x="375" y="175" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="ddch1Rv0aTiE" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="J8SsPhfYKZmW" widgetaid="4cyZLGRuFuQR" xmi.id="BTXE19fHMeq8" type="501" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="4cyZLGRuFuQR" linecolor="none" totalcounta="2" xmi.id="BTXE19fHMeq8" widgetbid="J8SsPhfYKZmW" totalcountb="2" type="501" linewidth="none" >
           <linepath>
-           <startpoint startx="605" starty="191" />
+           <startpoint startx="605" starty="187" />
            <endpoint endx="478" endy="187" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="34" x="589" fillcolor="none" y="172" linewidth="none" posttext="" role="701" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="uMPA54Wa8ytS" text="0..N" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="32" x="462" fillcolor="none" y="184" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="YxwGVcRTKqyZ" text="1..1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="34" x="589" y="172" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="8vOVCxtUlR82" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
-          <floatingtext width="32" x="462" y="184" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="FKBGvqnAF0TW" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="34" x="589" y="172" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="zo1kM89delVe" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
+          <floatingtext width="32" x="462" y="184" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="2lgCiHELsq2t" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" linewidth="none" widgetbid="J8SsPhfYKZmW" widgetaid="4M4dK9M6XlQq" roleBdoc="" documentation="" roleAdoc="" type="513" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+         <assocwidget indexa="1" indexb="1" visibilityA="0" widgetaid="4M4dK9M6XlQq" visibilityB="0" roleBdoc="" roleAdoc="" linecolor="none" changeabilityA="900" totalcounta="2" changeabilityB="900" widgetbid="J8SsPhfYKZmW" totalcountb="2" type="513" documentation="" linewidth="none" >
           <linepath>
-           <startpoint startx="451" starty="292" />
+           <startpoint startx="444" starty="292" />
            <endpoint endx="444" endy="207" />
           </linepath>
          </assocwidget>
         </associations>
        </diagram>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-       <diagram snapgrid="0" showattsig="1" fillcolor="#ffff00" linewidth="0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="944" snapy="10" showatts="1" xmi.id="C827JMNPgNXZ" documentation="" type="1" showops="1" showpackage="1" name="Orders" localid="" showstereotype="1" showscope="1" snapcsgrid="0" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="851" >
-=======
-       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="1" showstereotype="1" name="Orders" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="533" canvaswidth="942" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="C827JMNPgNXZ" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="0" snapy="10" linewidth="0" showattsig="1" showpubliconly="0" showpackage="1" showstereotype="1" name="Orders" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="600" canvaswidth="1160" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="C827JMNPgNXZ" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
         <widgets>
-         <classwidget usesdiagramfillcolor="1" width="125" showattsigs="601" x="155" fillcolor="none" y="212" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="9m8Qj7mNVHWt" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="106" showattsigs="601" x="164" fillcolor="#ffffc0" y="287" showopsigs="601" linewidth="none" height="56" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="P0toAiR6U083" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="1" width="81" showattsigs="601" x="319" fillcolor="none" y="215" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="l4f7vJlc79Qq" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="135" showattsigs="601" x="261" fillcolor="#ffffc0" y="5" showopsigs="601" linewidth="none" height="152" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="tuIzeslDqJW5" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="137" showattsigs="601" x="586" fillcolor="#29ff29" y="110" showopsigs="601" linewidth="none" height="72" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="aDjWeslUEANx" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="1" width="73" showattsigs="601" x="392" fillcolor="none" y="302" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="pXwBgpXvFPTv" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="167" showattsigs="601" x="517" fillcolor="#ffffc0" y="218" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="CzdNEBmDsnGX" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="211" showattsigs="601" x="727" fillcolor="#00ff00" y="401" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="WasJ2iNgmUNO" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="223" showattsigs="601" x="367" fillcolor="#00ff00" y="398" showopsigs="601" linewidth="none" height="40" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="FlXADIefsqnc" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="1" width="68" showattsigs="601" x="54" fillcolor="none" y="36" showopsigs="601" linewidth="none" height="40" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="J8SsPhfYKZmW" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <notewidget usesdiagramfillcolor="1" width="252" x="640" fillcolor="none" y="2" linewidth="none" height="100" usefillcolor="1" isinstance="0" xmi.id="q8B6Zo6eONeB" text="Hours Groups should be moved from OrderLine to OrderElement as it is done in this diagram. The atribute resourceType should be MACHINE or WORKER" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="155" showattsigs="601" y="212" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="125" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="9m8Qj7mNVHWt" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="164" showattsigs="601" y="287" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="106" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="P0toAiR6U083" showscope="1" height="56" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="319" showattsigs="601" y="215" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="81" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="l4f7vJlc79Qq" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="261" showattsigs="601" y="5" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="135" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="tuIzeslDqJW5" showscope="1" height="152" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="586" showattsigs="601" y="110" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="137" isinstance="0" usefillcolor="1" fillcolor="#29ff29" xmi.id="aDjWeslUEANx" showscope="1" height="72" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="392" showattsigs="601" y="302" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="73" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="pXwBgpXvFPTv" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="517" showattsigs="601" y="218" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="167" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="CzdNEBmDsnGX" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="727" showattsigs="601" y="401" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="211" isinstance="0" usefillcolor="1" fillcolor="#00ff00" xmi.id="WasJ2iNgmUNO" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="367" showattsigs="601" y="398" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="223" isinstance="0" usefillcolor="1" fillcolor="#00ff00" xmi.id="FlXADIefsqnc" showscope="1" height="40" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="0" x="54" showattsigs="601" y="36" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="68" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="J8SsPhfYKZmW" showscope="1" height="40" showopsigs="601" />
+         <notewidget width="252" x="640" noteType="0" y="2" usesdiagramusefillcolor="1" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="100" linecolor="none" xmi.id="q8B6Zo6eONeB" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="Hours Groups should be moved from OrderLine to OrderElement as it is done in this diagram. The atribute resourceType should be MACHINE or WORKER" />
         </widgets>
         <messages/>
         <associations>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="9m8Qj7mNVHWt" widgetaid="P0toAiR6U083" xmi.id="B2K2UzfVI9Wi" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="P0toAiR6U083" linecolor="none" totalcounta="2" xmi.id="B2K2UzfVI9Wi" widgetbid="9m8Qj7mNVHWt" totalcountb="2" type="500" linewidth="none" >
           <linepath>
            <startpoint startx="217" starty="287" />
            <endpoint endx="217" endy="244" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="3" indexa="2" totalcountb="3" indexb="1" linewidth="none" widgetbid="tuIzeslDqJW5" widgetaid="9m8Qj7mNVHWt" xmi.id="th9P9NXUOrdg" type="500" linecolor="none" >
+         <assocwidget indexa="2" indexb="1" widgetaid="9m8Qj7mNVHWt" linecolor="none" totalcounta="3" xmi.id="th9P9NXUOrdg" widgetbid="tuIzeslDqJW5" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="238" starty="212" />
-           <endpoint endx="306" endy="157" />
+           <startpoint startx="280" starty="212" />
+           <endpoint endx="280" endy="157" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="tuIzeslDqJW5" widgetaid="l4f7vJlc79Qq" xmi.id="C7h2uwZmyT9F" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="2" widgetaid="l4f7vJlc79Qq" linecolor="none" totalcounta="2" xmi.id="C7h2uwZmyT9F" widgetbid="tuIzeslDqJW5" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="359" starty="215" />
+           <startpoint startx="351" starty="215" />
            <endpoint endx="351" endy="157" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="3" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="tuIzeslDqJW5" widgetaid="9m8Qj7mNVHWt" xmi.id="6TQ6Ez2FKbOm" type="501" linecolor="none" >
+         <assocwidget indexa="1" indexb="2" widgetaid="9m8Qj7mNVHWt" linecolor="none" totalcounta="3" xmi.id="6TQ6Ez2FKbOm" widgetbid="tuIzeslDqJW5" totalcountb="3" type="501" linewidth="none" >
           <linepath>
            <startpoint startx="196" starty="212" />
            <endpoint endx="261" endy="106" />
            <point x="196" y="106" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="aDjWeslUEANx" widgetaid="tuIzeslDqJW5" xmi.id="zg1HpXzSx1uP" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="tuIzeslDqJW5" linecolor="none" totalcounta="3" xmi.id="zg1HpXzSx1uP" widgetbid="aDjWeslUEANx" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="396" starty="55" />
+           <startpoint startx="396" starty="146" />
            <endpoint endx="586" endy="146" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="31" x="402" fillcolor="none" y="41" linewidth="none" posttext="" role="701" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="eqzkoqALn4bJ" text="0..*" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="74" x="398" fillcolor="none" y="99" linewidth="none" posttext="" role="709" height="20" usefillcolor="1" pretext="+" isinstance="0" xmi.id="Z8pQL2AEMaMP" text="contains" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="31" x="402" y="41" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="d7sMZ0OoIZ2B" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
-          <floatingtext width="74" x="398" y="99" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="709" linecolor="none" xmi.id="fYovcKJlDfGQ" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="contains" pretext="+" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="31" x="402" y="41" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="9EJlxmPzX3AD" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
+          <floatingtext width="74" x="398" y="99" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="709" linecolor="none" xmi.id="FvrpPY4MM34g" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="contains" pretext="+" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="pXwBgpXvFPTv" widgetaid="CzdNEBmDsnGX" xmi.id="PGYCCNTyF7TI" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="CzdNEBmDsnGX" linecolor="none" totalcounta="2" xmi.id="PGYCCNTyF7TI" widgetbid="pXwBgpXvFPTv" totalcountb="2" type="512" linewidth="none" >
           <linepath>
            <startpoint startx="517" starty="234" />
            <endpoint endx="428" endy="302" />
            <point x="428" y="234" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="15" x="500" fillcolor="none" y="212" linewidth="none" posttext="" role="701" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="e0kyqjVPrLnB" text="*" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="32" x="428" fillcolor="none" y="281" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="LyNhWj68Z3qN" text="1..1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="15" x="500" y="212" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="NqJcqn7TLvNw" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="*" pretext="" />
-          <floatingtext width="32" x="428" y="281" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="DghRLvpw3hJa" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="15" x="500" y="212" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="LOYDFZ5UUuIr" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="*" pretext="" />
+          <floatingtext width="32" x="428" y="281" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="SMBoNGUXSlGN" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
          </assocwidget>
-         <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="CzdNEBmDsnGX" widgetaid="tuIzeslDqJW5" xmi.id="Eddd1PYLJZsj" type="503" linecolor="none" >
+         <assocwidget indexa="2" indexb="1" widgetaid="tuIzeslDqJW5" linecolor="none" totalcounta="3" xmi.id="Eddd1PYLJZsj" widgetbid="CzdNEBmDsnGX" totalcountb="2" type="503" linewidth="none" >
           <linepath>
-           <startpoint startx="396" starty="106" />
-           <endpoint endx="600" endy="218" />
+           <startpoint startx="396" starty="157" />
+           <endpoint endx="517" endy="218" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="CzdNEBmDsnGX" widgetaid="aDjWeslUEANx" xmi.id="PqlFdBLug2Vo" type="503" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="aDjWeslUEANx" linecolor="none" totalcounta="2" xmi.id="PqlFdBLug2Vo" widgetbid="CzdNEBmDsnGX" totalcountb="2" type="503" linewidth="none" >
           <linepath>
-           <startpoint startx="723" starty="146" />
+           <startpoint startx="723" starty="147" />
            <endpoint endx="684" endy="234" />
            <point x="808" y="147" />
            <point x="807" y="234" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="16" x="725" fillcolor="none" y="132" linewidth="none" posttext="" role="701" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="u0gf2HwhHhd7" text="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="15" x="687" fillcolor="none" y="212" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="Q7VFSIOnElSi" text="*" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="16" x="725" y="132" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="ghMwFO6cCPD1" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1" pretext="" />
-          <floatingtext width="15" x="687" y="212" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="CKUWDrSPV7qp" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="*" pretext="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="16" x="725" y="132" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="YgN3hVH2tnE6" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1" pretext="" />
+          <floatingtext width="15" x="687" y="212" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="MJZpBreeBoQY" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="*" pretext="" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="CzdNEBmDsnGX" widgetaid="WasJ2iNgmUNO" xmi.id="810lqRZuxUkW" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="2" widgetaid="WasJ2iNgmUNO" linecolor="none" totalcounta="2" xmi.id="810lqRZuxUkW" widgetbid="CzdNEBmDsnGX" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="832" starty="401" />
-           <endpoint endx="628" endy="250" />
+           <startpoint startx="727" starty="401" />
+           <endpoint endx="684" endy="250" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="FlXADIefsqnc" widgetaid="WasJ2iNgmUNO" xmi.id="Sz23mT32SUan" type="510" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="WasJ2iNgmUNO" linecolor="none" totalcounta="2" xmi.id="Sz23mT32SUan" widgetbid="FlXADIefsqnc" totalcountb="2" type="510" linewidth="none" >
           <linepath>
-           <startpoint startx="727" starty="417" />
+           <startpoint startx="727" starty="418" />
            <endpoint endx="590" endy="418" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="31" x="582" fillcolor="none" y="401" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="LzKagvi62BKU" text="0..*" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="71" x="616" fillcolor="none" y="394" linewidth="none" posttext="" role="710" height="20" usefillcolor="1" pretext="+" isinstance="0" xmi.id="UWq1XeNPc35f" text="children" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="31" x="582" y="401" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="MzVYOiZZ043C" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
-          <floatingtext width="71" x="616" y="394" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="710" linecolor="none" xmi.id="0fl3K2byixvv" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="children" pretext="+" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="31" x="582" y="401" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="jRgbEuhZBGMM" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..*" pretext="" />
+          <floatingtext width="71" x="616" y="394" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="710" linecolor="none" xmi.id="4t3WcKt8yECf" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="children" pretext="+" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="CzdNEBmDsnGX" widgetaid="FlXADIefsqnc" xmi.id="3sWbDbUnzm2a" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="FlXADIefsqnc" linecolor="none" totalcounta="2" xmi.id="3sWbDbUnzm2a" widgetbid="CzdNEBmDsnGX" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="478" starty="398" />
+           <startpoint startx="572" starty="398" />
            <endpoint endx="572" endy="250" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="WasJ2iNgmUNO" widgetaid="FlXADIefsqnc" xmi.id="f0wclyDapGkh" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="FlXADIefsqnc" linecolor="none" totalcounta="2" xmi.id="f0wclyDapGkh" widgetbid="WasJ2iNgmUNO" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="478" starty="438" />
-           <endpoint endx="832" endy="433" />
+           <startpoint startx="506" starty="438" />
+           <endpoint endx="822" endy="433" />
            <point x="506" y="485" />
            <point x="822" y="485" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="32" x="837" fillcolor="none" y="436" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="pL4QO95h7NIn" text="1..1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="61" x="742" fillcolor="none" y="444" linewidth="none" posttext="" role="710" height="20" usefillcolor="1" pretext="+" isinstance="0" xmi.id="RiFeUfMw9Byh" text="parent" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="32" x="837" y="436" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="wBJe9CZVB43X" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
-          <floatingtext width="61" x="742" y="444" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="710" linecolor="none" xmi.id="tTbNYPCY2vaK" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="parent" pretext="+" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="32" x="837" y="436" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="6E34QDiAeOjq" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
+          <floatingtext width="61" x="742" y="444" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="710" linecolor="none" xmi.id="5y0GmPnqIoKu" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="parent" pretext="+" />
          </assocwidget>
-         <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="J8SsPhfYKZmW" widgetaid="tuIzeslDqJW5" xmi.id="5PKYSxAl3acS" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="tuIzeslDqJW5" linecolor="none" totalcounta="3" xmi.id="5PKYSxAl3acS" widgetbid="J8SsPhfYKZmW" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="261" starty="55" />
+           <startpoint startx="261" starty="56" />
            <endpoint endx="122" endy="56" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="34" x="226" fillcolor="none" y="54" linewidth="none" posttext="" role="701" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="IysL9Cnau3CM" text="0..N" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="34" x="126" fillcolor="none" y="37" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="gZJqiHVVaZvy" text="0..N" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="34" x="226" y="54" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="lb6jd7tUaSr8" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
-          <floatingtext width="34" x="126" y="37" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="r1htvHErSVTZ" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="34" x="226" y="54" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="GQPPfjliikzU" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
+          <floatingtext width="34" x="126" y="37" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="9kJPYdJdpKhG" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" linewidth="none" widgetbid="q8B6Zo6eONeB" widgetaid="aDjWeslUEANx" roleBdoc="" documentation="" roleAdoc="" type="513" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+         <assocwidget indexa="1" indexb="1" visibilityA="0" widgetaid="aDjWeslUEANx" visibilityB="0" roleBdoc="" roleAdoc="" linecolor="none" changeabilityA="900" totalcounta="2" changeabilityB="900" widgetbid="q8B6Zo6eONeB" totalcountb="2" type="513" documentation="" linewidth="none" >
           <linepath>
-           <startpoint startx="654" starty="110" />
-           <endpoint endx="766" endy="102" />
+           <startpoint startx="723" starty="110" />
+           <endpoint endx="723" endy="102" />
           </linepath>
          </assocwidget>
         </associations>
        </diagram>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-       <diagram snapgrid="0" showattsig="1" fillcolor="#ffff00" linewidth="0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="944" snapy="10" showatts="1" xmi.id="S6yQPUlWs49s" documentation="" type="1" showops="1" showpackage="1" name="Resources" localid="" showstereotype="1" showscope="1" snapcsgrid="0" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="851" >
-=======
-       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="1" showstereotype="1" name="Resources" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="550" canvaswidth="824" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="S6yQPUlWs49s" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="0" snapy="10" linewidth="0" showattsig="1" showpubliconly="0" showpackage="1" showstereotype="1" name="Resources" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="600" canvaswidth="1160" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="S6yQPUlWs49s" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
         <widgets>
-         <classwidget usesdiagramfillcolor="1" width="78" showattsigs="601" x="256" fillcolor="none" y="149" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="QuCpOvJF0Q5L" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="63" showattsigs="601" x="193" fillcolor="#ffffc0" y="254" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="EuVtTEVBubBT" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="1" width="71" showattsigs="601" x="313" fillcolor="none" y="256" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="BYZCrni1720s" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="73" showattsigs="601" x="568" fillcolor="#ffffc0" y="148" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="pXwBgpXvFPTv" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="160" showattsigs="601" x="383" fillcolor="#ffffc0" y="149" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="F2fAyFCIedxF" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="1" width="143" showattsigs="601" x="50" fillcolor="none" y="150" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="pWd0kqSVARYy" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="106" showattsigs="601" x="667" fillcolor="#ffffc0" y="149" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="Ib6IrepGhyQ0" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="261" showattsigs="601" x="475" fillcolor="#ffffc0" y="258" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="hSbZH0wWFekO" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="201" showattsigs="601" x="457" fillcolor="#ffffc0" y="350" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="Kw2aCKPV84kE" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="256" showattsigs="601" y="149" showattributes="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" width="78" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="QuCpOvJF0Q5L" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="193" showattsigs="601" y="254" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="63" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="EuVtTEVBubBT" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="313" showattsigs="601" y="256" showattributes="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" width="71" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="BYZCrni1720s" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="568" showattsigs="601" y="148" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="73" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="pXwBgpXvFPTv" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="383" showattsigs="601" y="149" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="F2fAyFCIedxF" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="50" showattsigs="601" y="150" showattributes="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" width="143" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="pWd0kqSVARYy" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="667" showattsigs="601" y="149" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="106" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="Ib6IrepGhyQ0" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="475" showattsigs="601" y="258" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="261" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="hSbZH0wWFekO" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="457" showattsigs="601" y="350" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="201" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="Kw2aCKPV84kE" showscope="1" height="32" showopsigs="601" />
         </widgets>
         <messages/>
         <associations>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="QuCpOvJF0Q5L" widgetaid="EuVtTEVBubBT" xmi.id="ZHijoLFKrOsP" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="EuVtTEVBubBT" linecolor="none" totalcounta="2" xmi.id="ZHijoLFKrOsP" widgetbid="QuCpOvJF0Q5L" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="224" starty="254" />
-           <endpoint endx="282" endy="181" />
+           <startpoint startx="256" starty="254" />
+           <endpoint endx="256" endy="181" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="QuCpOvJF0Q5L" widgetaid="BYZCrni1720s" xmi.id="SqQIEIhnzr5j" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="2" widgetaid="BYZCrni1720s" linecolor="none" totalcounta="2" xmi.id="SqQIEIhnzr5j" widgetbid="QuCpOvJF0Q5L" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="348" starty="256" />
-           <endpoint endx="308" endy="181" />
+           <startpoint startx="313" starty="256" />
+           <endpoint endx="313" endy="181" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="0" indexb="0" linewidth="none" widgetbid="pXwBgpXvFPTv" widgetaid="pXwBgpXvFPTv" xmi.id="GG1DJNkCSAyv" type="504" linecolor="none" >
+         <assocwidget indexa="1" indexb="0" widgetaid="pXwBgpXvFPTv" linecolor="none" totalcounta="2" xmi.id="GG1DJNkCSAyv" widgetbid="pXwBgpXvFPTv" totalcountb="0" type="504" linewidth="none" >
           <linepath>
            <startpoint startx="586" starty="148" />
            <endpoint endx="622" endy="148" />
@@ -1936,361 +1790,305 @@ Tamen hai que introducir a restriccion de que non se pode definir un obxecto Adv
            <point x="622" y="98" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="pXwBgpXvFPTv" widgetaid="F2fAyFCIedxF" xmi.id="kf8mpoxDjBmw" type="503" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="F2fAyFCIedxF" linecolor="none" totalcounta="2" xmi.id="kf8mpoxDjBmw" widgetbid="pXwBgpXvFPTv" totalcountb="2" type="503" linewidth="none" >
           <linepath>
-           <startpoint startx="543" starty="165" />
+           <startpoint startx="543" starty="164" />
            <endpoint endx="568" endy="164" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="pXwBgpXvFPTv" widgetaid="Ib6IrepGhyQ0" xmi.id="vLMfU7ZEDrxm" type="503" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="Ib6IrepGhyQ0" linecolor="none" totalcounta="2" xmi.id="vLMfU7ZEDrxm" widgetbid="pXwBgpXvFPTv" totalcountb="2" type="503" linewidth="none" >
           <linepath>
-           <startpoint startx="667" starty="165" />
+           <startpoint startx="667" starty="164" />
            <endpoint endx="641" endy="164" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="QuCpOvJF0Q5L" widgetaid="F2fAyFCIedxF" xmi.id="oyg1ocmICO1U" type="503" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="F2fAyFCIedxF" linecolor="none" totalcounta="2" xmi.id="oyg1ocmICO1U" widgetbid="QuCpOvJF0Q5L" totalcountb="2" type="503" linewidth="none" >
           <linepath>
            <startpoint startx="383" starty="165" />
            <endpoint endx="334" endy="165" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="pWd0kqSVARYy" widgetaid="QuCpOvJF0Q5L" xmi.id="xSY8oXawKimC" type="503" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="QuCpOvJF0Q5L" linecolor="none" totalcounta="2" xmi.id="xSY8oXawKimC" widgetbid="pWd0kqSVARYy" totalcountb="2" type="503" linewidth="none" >
           <linepath>
-           <startpoint startx="256" starty="165" />
+           <startpoint startx="256" starty="166" />
            <endpoint endx="193" endy="166" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="hSbZH0wWFekO" widgetaid="BYZCrni1720s" xmi.id="0jiGA0CLh1ex" type="503" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="BYZCrni1720s" linecolor="none" totalcounta="2" xmi.id="0jiGA0CLh1ex" widgetbid="hSbZH0wWFekO" totalcountb="2" type="503" linewidth="none" >
           <linepath>
-           <startpoint startx="384" starty="272" />
+           <startpoint startx="384" starty="274" />
            <endpoint endx="475" endy="274" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="pXwBgpXvFPTv" widgetaid="hSbZH0wWFekO" xmi.id="E3t7mJFEbW5r" type="503" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="hSbZH0wWFekO" linecolor="none" totalcounta="2" xmi.id="E3t7mJFEbW5r" widgetbid="pXwBgpXvFPTv" totalcountb="2" type="503" linewidth="none" >
           <linepath>
-           <startpoint startx="605" starty="258" />
+           <startpoint startx="604" starty="258" />
            <endpoint endx="604" endy="180" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="Kw2aCKPV84kE" widgetaid="EuVtTEVBubBT" xmi.id="A0sRjiv11VBq" type="503" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="EuVtTEVBubBT" linecolor="none" totalcounta="2" xmi.id="A0sRjiv11VBq" widgetbid="Kw2aCKPV84kE" totalcountb="2" type="503" linewidth="none" >
           <linepath>
            <startpoint startx="224" starty="286" />
-           <endpoint endx="457" endy="366" />
+           <endpoint endx="457" endy="365" />
            <point x="224" y="365" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="Kw2aCKPV84kE" widgetaid="hSbZH0wWFekO" xmi.id="iPkaZGslsKcu" type="501" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="hSbZH0wWFekO" linecolor="none" totalcounta="2" xmi.id="iPkaZGslsKcu" widgetbid="Kw2aCKPV84kE" totalcountb="2" type="501" linewidth="none" >
           <linepath>
-           <startpoint startx="605" starty="290" />
+           <startpoint startx="557" starty="290" />
            <endpoint endx="557" endy="350" />
           </linepath>
          </assocwidget>
         </associations>
        </diagram>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-       <diagram snapgrid="0" showattsig="1" fillcolor="#ffff00" linewidth="0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1075" snapy="10" showatts="1" xmi.id="Al723HW1jXBv" documentation="" type="1" showops="1" showpackage="1" name="Calendars" localid="" showstereotype="1" showscope="1" snapcsgrid="0" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="835" >
-=======
-       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="1" showstereotype="1" name="Calendars" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="533" canvaswidth="1075" localid="" snapcsgrid="0" showgrid="1" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="Al723HW1jXBv" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="0" snapy="10" linewidth="0" showattsig="1" showpubliconly="0" showpackage="1" showstereotype="1" name="Calendars" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="600" canvaswidth="1160" localid="" snapcsgrid="0" showgrid="1" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="Al723HW1jXBv" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
         <widgets>
-         <classwidget usesdiagramfillcolor="1" width="143" showattsigs="601" x="412" fillcolor="none" y="257" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="pWd0kqSVARYy" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="496" showattsigs="601" x="255" fillcolor="#ffffc0" y="147" showopsigs="601" linewidth="none" height="80" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="ntefL6x2Ab2r" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="110" showattsigs="601" x="75" fillcolor="#ffffc0" y="159" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="djb5JvjZ9GTh" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="154" showattsigs="601" x="588" fillcolor="#00ff00" y="70" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="REhCQm4MOB01" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="253" showattsigs="601" x="818" fillcolor="#ffffc0" y="155" showopsigs="601" linewidth="none" height="64" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="0WqNRLCOXQXR" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="181" showattsigs="601" x="855" fillcolor="#00ff00" y="58" showopsigs="601" linewidth="none" height="72" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="9aZodH8figJs" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="108" showattsigs="601" x="590" fillcolor="#00ff00" y="259" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="y8PAxnHdWHgm" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="1" width="78" showattsigs="601" x="230" fillcolor="none" y="251" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="QuCpOvJF0Q5L" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="43" showattsigs="601" x="599" fillcolor="#ffffc0" y="345" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="oRwdH97rBGn9" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
-         <notewidget usesdiagramfillcolor="1" width="174" x="372" fillcolor="none" y="22" linewidth="none" height="96" usefillcolor="1" isinstance="0" xmi.id="oUXh8daTKGG6" text="The calendar availability could only be associated to ResourceCalendars and TaskCalendars." usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="412" showattsigs="601" y="257" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="143" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="pWd0kqSVARYy" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="255" showattsigs="601" y="147" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="496" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="ntefL6x2Ab2r" showscope="1" height="80" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="75" showattsigs="601" y="159" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="110" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="djb5JvjZ9GTh" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="588" showattsigs="601" y="70" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="154" isinstance="0" usefillcolor="1" fillcolor="#00ff00" xmi.id="REhCQm4MOB01" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="818" showattsigs="601" y="155" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="253" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="0WqNRLCOXQXR" showscope="1" height="64" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="0" x="855" showattsigs="601" y="58" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="181" isinstance="0" usefillcolor="1" fillcolor="#00ff00" xmi.id="9aZodH8figJs" showscope="1" height="72" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="590" showattsigs="601" y="259" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="108" isinstance="0" usefillcolor="1" fillcolor="#00ff00" xmi.id="y8PAxnHdWHgm" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="230" showattsigs="601" y="251" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="78" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="QuCpOvJF0Q5L" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="599" showattsigs="601" y="345" showattributes="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" width="43" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="oRwdH97rBGn9" showscope="1" height="32" showopsigs="601" />
+         <notewidget width="174" x="372" noteType="0" y="22" usesdiagramusefillcolor="1" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="96" linecolor="none" xmi.id="oUXh8daTKGG6" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="The calendar availability could only be associated to ResourceCalendars and TaskCalendars." />
         </widgets>
         <messages/>
         <associations>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="ntefL6x2Ab2r" widgetaid="pWd0kqSVARYy" xmi.id="44THOkEiSaKg" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="pWd0kqSVARYy" linecolor="none" totalcounta="2" xmi.id="44THOkEiSaKg" widgetbid="ntefL6x2Ab2r" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="483" starty="257" />
+           <startpoint startx="420" starty="257" />
            <endpoint endx="420" endy="227" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="ntefL6x2Ab2r" widgetaid="djb5JvjZ9GTh" xmi.id="20Vbv9iLVgLw" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="djb5JvjZ9GTh" linecolor="none" totalcounta="2" xmi.id="20Vbv9iLVgLw" widgetbid="ntefL6x2Ab2r" totalcountb="3" type="512" linewidth="none" >
           <linepath>
            <startpoint startx="130" starty="159" />
-           <endpoint endx="420" endy="147" />
+           <endpoint endx="361" endy="147" />
            <point x="130" y="91" />
            <point x="361" y="91" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="50" x="130" fillcolor="none" y="125" linewidth="none" posttext="" role="703" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="hygoLybewTx3" text="parent" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="50" x="130" y="125" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="04q26LlfSTIX" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="parent" pretext="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="50" x="130" y="125" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="NO9j50zVNO87" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="parent" pretext="" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="djb5JvjZ9GTh" widgetaid="ntefL6x2Ab2r" xmi.id="3oF4IIw3C3pt" type="501" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="ntefL6x2Ab2r" linecolor="none" totalcounta="2" xmi.id="3oF4IIw3C3pt" widgetbid="djb5JvjZ9GTh" totalcountb="2" type="501" linewidth="none" >
           <linepath>
-           <startpoint startx="255" starty="187" />
+           <startpoint startx="255" starty="175" />
            <endpoint endx="185" endy="175" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="0WqNRLCOXQXR" widgetaid="ntefL6x2Ab2r" xmi.id="bxb1FZ7c3xzw" type="510" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="ntefL6x2Ab2r" linecolor="none" totalcounta="2" xmi.id="bxb1FZ7c3xzw" widgetbid="0WqNRLCOXQXR" totalcountb="2" type="510" linewidth="none" >
           <linepath>
            <startpoint startx="751" starty="187" />
            <endpoint endx="818" endy="187" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="9aZodH8figJs" widgetaid="0WqNRLCOXQXR" xmi.id="Wy2jH22C5H63" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="0WqNRLCOXQXR" linecolor="none" totalcounta="2" xmi.id="Wy2jH22C5H63" widgetbid="9aZodH8figJs" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="944" starty="155" />
+           <startpoint startx="945" starty="155" />
            <endpoint endx="945" endy="130" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="REhCQm4MOB01" widgetaid="ntefL6x2Ab2r" xmi.id="ms6mh1zsBySy" type="501" linecolor="none" >
+         <assocwidget indexa="2" indexb="1" widgetaid="ntefL6x2Ab2r" linecolor="none" totalcounta="3" xmi.id="ms6mh1zsBySy" widgetbid="REhCQm4MOB01" totalcountb="2" type="501" linewidth="none" >
           <linepath>
-           <startpoint startx="585" starty="147" />
+           <startpoint startx="665" starty="147" />
            <endpoint endx="665" endy="102" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="ntefL6x2Ab2r" widgetaid="y8PAxnHdWHgm" xmi.id="NVNl6sBm5XfV" type="500" linecolor="none" >
+         <assocwidget indexa="1" indexb="2" widgetaid="y8PAxnHdWHgm" linecolor="none" totalcounta="2" xmi.id="NVNl6sBm5XfV" widgetbid="ntefL6x2Ab2r" totalcountb="3" type="500" linewidth="none" >
           <linepath>
-           <startpoint startx="644" starty="259" />
-           <endpoint endx="585" endy="227" />
+           <startpoint startx="590" starty="259" />
+           <endpoint endx="590" endy="227" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="3" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="y8PAxnHdWHgm" widgetaid="oRwdH97rBGn9" xmi.id="zsUUFYvSH4J1" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="oRwdH97rBGn9" linecolor="none" totalcounta="3" xmi.id="zsUUFYvSH4J1" widgetbid="y8PAxnHdWHgm" totalcountb="3" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="613" starty="345" />
+           <startpoint startx="626" starty="345" />
            <endpoint endx="626" endy="291" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="151" x="648" fillcolor="none" y="312" linewidth="none" posttext="" role="703" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="dkbYlosSLBI1" text="machineTaskCalendar" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="16" x="636" fillcolor="none" y="323" linewidth="none" posttext="" role="701" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="QnW0KQx1Odpi" text="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="29" x="638" fillcolor="none" y="293" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="ZRMTsJUW152n" text="0-1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="151" x="648" y="312" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="Mm8pcEgdtYWA" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="machineTaskCalendar" pretext="" />
-          <floatingtext width="16" x="636" y="323" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="kLbFo8uoDipH" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1" pretext="" />
-          <floatingtext width="29" x="638" y="293" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="3awT3EzQy7Da" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0-1" pretext="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="151" x="648" y="312" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="8rnsoFzWWO28" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="machineTaskCalendar" pretext="" />
+          <floatingtext width="16" x="636" y="323" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="ffx0LBViXfSc" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1" pretext="" />
+          <floatingtext width="29" x="638" y="293" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="dP6ymC3u3qkp" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0-1" pretext="" />
          </assocwidget>
-         <assocwidget totalcounta="3" indexa="2" totalcountb="3" indexb="2" linewidth="none" widgetbid="y8PAxnHdWHgm" widgetaid="oRwdH97rBGn9" xmi.id="MwHQnc1Dm9HN" type="512" linecolor="none" >
+         <assocwidget indexa="2" indexb="2" widgetaid="oRwdH97rBGn9" linecolor="none" totalcounta="3" xmi.id="MwHQnc1Dm9HN" widgetbid="y8PAxnHdWHgm" totalcountb="3" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="627" starty="345" />
-           <endpoint endx="662" endy="291" />
+           <startpoint startx="642" starty="345" />
+           <endpoint endx="642" endy="291" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="140" x="458" fillcolor="none" y="317" linewidth="none" posttext="" role="703" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="ruDA4VBSGgTa" text="workerTaskCalendar" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="16" x="604" fillcolor="none" y="323" linewidth="none" posttext="" role="701" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="4OaQzP8YqSzh" text="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="29" x="567" fillcolor="none" y="296" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="jRDlWFYM9lUB" text="0-1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="140" x="458" y="317" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="LrCDPiL74wMq" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="workerTaskCalendar" pretext="" />
-          <floatingtext width="16" x="604" y="323" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="3EdGuSVw2RN4" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1" pretext="" />
-          <floatingtext width="29" x="567" y="296" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="dMSZTfAnUKys" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0-1" pretext="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="140" x="458" y="317" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="703" linecolor="none" xmi.id="4jLa5Oii1eiM" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="workerTaskCalendar" pretext="" />
+          <floatingtext width="16" x="604" y="323" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="pC5LpVxQu1Oe" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1" pretext="" />
+          <floatingtext width="29" x="567" y="296" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="ESYFGG5KxOt2" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0-1" pretext="" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="pWd0kqSVARYy" widgetaid="QuCpOvJF0Q5L" xmi.id="KnonRVuLZaF6" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="QuCpOvJF0Q5L" linecolor="none" totalcounta="2" xmi.id="KnonRVuLZaF6" widgetbid="pWd0kqSVARYy" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="308" starty="267" />
+           <startpoint startx="308" starty="273" />
            <endpoint endx="412" endy="273" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" linewidth="none" widgetbid="REhCQm4MOB01" widgetaid="oUXh8daTKGG6" roleBdoc="" documentation="" roleAdoc="" type="513" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+         <assocwidget indexa="1" indexb="1" visibilityA="0" widgetaid="oUXh8daTKGG6" visibilityB="0" roleBdoc="" roleAdoc="" linecolor="none" changeabilityA="900" totalcounta="2" changeabilityB="900" widgetbid="REhCQm4MOB01" totalcountb="2" type="513" documentation="" linewidth="none" >
           <linepath>
-           <startpoint startx="546" starty="70" />
+           <startpoint startx="546" starty="86" />
            <endpoint endx="588" endy="86" />
           </linepath>
          </assocwidget>
         </associations>
        </diagram>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-       <diagram snapgrid="0" showattsig="1" fillcolor="#ffff00" linewidth="0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="944" snapy="10" showatts="1" xmi.id="lRwZmKnJy6yj" documentation="" type="1" showops="1" showpackage="1" name="Work Reports" localid="" showstereotype="1" showscope="1" snapcsgrid="0" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="851" >
-=======
-       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="1" showstereotype="1" name="Work Reports" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="550" canvaswidth="824" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="lRwZmKnJy6yj" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="0" snapy="10" linewidth="0" showattsig="1" showpubliconly="0" showpackage="1" showstereotype="1" name="Work Reports" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="600" canvaswidth="1160" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="lRwZmKnJy6yj" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
         <widgets>
-         <classwidget usesdiagramfillcolor="0" width="97" showattsigs="601" x="213" fillcolor="#ffffc0" y="245" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="4xsyjJuI5D3M" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="130" showattsigs="601" x="23" fillcolor="#ffffc0" y="243" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="rAYL8dKCYC8F" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="127" showattsigs="601" x="384" fillcolor="#ffffc0" y="246" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="kOXTy1K6CLkK" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="1" width="78" showattsigs="601" x="407" fillcolor="none" y="348" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="QuCpOvJF0Q5L" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="111" showattsigs="601" x="549" fillcolor="#ffffc0" y="149" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="tuIzeslDqJW5" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,75,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="1" width="82" showattsigs="601" x="236" fillcolor="none" y="69" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="4cyZLGRuFuQR" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="169" showattsigs="601" x="5" fillcolor="#ffffc0" y="69" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="cCjTVCxVWMoz" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="1" width="49" showattsigs="601" x="402" fillcolor="none" y="69" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="J8SsPhfYKZmW" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="1" width="119" showattsigs="601" x="597" fillcolor="none" y="244" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="HRweRDeLQktl" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="213" showattsigs="601" y="245" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="97" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="4xsyjJuI5D3M" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="23" showattsigs="601" y="243" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="130" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="rAYL8dKCYC8F" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="384" showattsigs="601" y="246" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="127" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="kOXTy1K6CLkK" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="407" showattsigs="601" y="348" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="78" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="QuCpOvJF0Q5L" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="549" showattsigs="601" y="149" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="111" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="tuIzeslDqJW5" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="236" showattsigs="601" y="69" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="82" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="4cyZLGRuFuQR" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="5" showattsigs="601" y="69" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="169" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="cCjTVCxVWMoz" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="402" showattsigs="601" y="69" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="49" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="J8SsPhfYKZmW" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="597" showattsigs="601" y="244" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="119" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="HRweRDeLQktl" showscope="1" height="32" showopsigs="601" />
         </widgets>
         <messages/>
         <associations>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="rAYL8dKCYC8F" widgetaid="4xsyjJuI5D3M" xmi.id="RvvXI8gOvMbg" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="4xsyjJuI5D3M" linecolor="none" totalcounta="2" xmi.id="RvvXI8gOvMbg" widgetbid="rAYL8dKCYC8F" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="213" starty="261" />
+           <startpoint startx="213" starty="259" />
            <endpoint endx="153" endy="259" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="kOXTy1K6CLkK" widgetaid="4xsyjJuI5D3M" xmi.id="yX4w9Ly1AxT7" type="510" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="4xsyjJuI5D3M" linecolor="none" totalcounta="2" xmi.id="yX4w9Ly1AxT7" widgetbid="kOXTy1K6CLkK" totalcountb="2" type="510" linewidth="none" >
           <linepath>
-           <startpoint startx="310" starty="261" />
+           <startpoint startx="310" starty="262" />
            <endpoint endx="384" endy="262" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="QuCpOvJF0Q5L" widgetaid="kOXTy1K6CLkK" xmi.id="AC0grSIA94RD" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="kOXTy1K6CLkK" linecolor="none" totalcounta="2" xmi.id="AC0grSIA94RD" widgetbid="QuCpOvJF0Q5L" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="447" starty="278" />
+           <startpoint startx="446" starty="278" />
            <endpoint endx="446" endy="348" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="tuIzeslDqJW5" widgetaid="kOXTy1K6CLkK" xmi.id="9mBJoaWvbrg5" type="512" linecolor="none" >
+         <assocwidget indexa="2" indexb="1" widgetaid="kOXTy1K6CLkK" linecolor="none" totalcounta="3" xmi.id="9mBJoaWvbrg5" widgetbid="tuIzeslDqJW5" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="468" starty="246" />
-           <endpoint endx="604" endy="181" />
+           <startpoint startx="511" starty="246" />
+           <endpoint endx="549" endy="181" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="J8SsPhfYKZmW" widgetaid="tuIzeslDqJW5" xmi.id="5PKYSxAl3acS" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="tuIzeslDqJW5" linecolor="none" totalcounta="2" xmi.id="5PKYSxAl3acS" widgetbid="J8SsPhfYKZmW" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="604" starty="149" />
-           <endpoint endx="451" endy="85" />
+           <startpoint startx="549" starty="149" />
+           <endpoint endx="451" endy="101" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="34" x="589" fillcolor="none" y="125" linewidth="none" posttext="" role="701" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="EgeSK50MTamS" text="0..N" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="34" x="470" fillcolor="none" y="74" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="yvymNvT7Mgqq" text="0..N" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="34" x="589" y="125" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="2Jz4GKtJYWXR" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
-          <floatingtext width="34" x="470" y="74" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="y0NyPk027SZY" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="34" x="589" y="125" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="kblmDR61b9MQ" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
+          <floatingtext width="34" x="470" y="74" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="eHoXJDBVfikv" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="J8SsPhfYKZmW" widgetaid="4cyZLGRuFuQR" xmi.id="BTXE19fHMeq8" type="501" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="4cyZLGRuFuQR" linecolor="none" totalcounta="2" xmi.id="BTXE19fHMeq8" widgetbid="J8SsPhfYKZmW" totalcountb="2" type="501" linewidth="none" >
           <linepath>
            <startpoint startx="318" starty="85" />
            <endpoint endx="402" endy="85" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="34" x="335" fillcolor="none" y="51" linewidth="none" posttext="" role="701" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="vMC37fEJJqjd" text="0..N" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-          <floatingtext usesdiagramfillcolor="1" width="32" x="347" fillcolor="none" y="45" linewidth="none" posttext="" role="702" height="20" usefillcolor="1" pretext="" isinstance="0" xmi.id="vhxMGjoEck00" text="1..1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext width="34" x="335" y="51" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="5jJa1HS2bR6p" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
-          <floatingtext width="32" x="347" y="45" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="lz6ITbjRb4O0" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext width="34" x="335" y="51" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="701" linecolor="none" xmi.id="ynEuC7uugdgu" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="0..N" pretext="" />
+          <floatingtext width="32" x="347" y="45" usesdiagramusefillcolor="1" posttext="" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="20" role="702" linecolor="none" xmi.id="3lveuF3ZWr4n" usefillcolor="1" linewidth="none" font="Sans Serif,10,-1,5,50,0,0,0,0,0" text="1..1" pretext="" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="cCjTVCxVWMoz" widgetaid="rAYL8dKCYC8F" xmi.id="XNWkT3Q27j8q" type="503" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="rAYL8dKCYC8F" linecolor="none" totalcounta="2" xmi.id="XNWkT3Q27j8q" widgetbid="cCjTVCxVWMoz" totalcountb="2" type="503" linewidth="none" >
           <linepath>
-           <startpoint startx="88" starty="243" />
+           <startpoint startx="89" starty="243" />
            <endpoint endx="89" endy="101" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="4cyZLGRuFuQR" widgetaid="cCjTVCxVWMoz" xmi.id="ErNJbT9oXpJJ" type="503" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="cCjTVCxVWMoz" linecolor="none" totalcounta="2" xmi.id="ErNJbT9oXpJJ" widgetbid="4cyZLGRuFuQR" totalcountb="2" type="503" linewidth="none" >
           <linepath>
            <startpoint startx="174" starty="85" />
            <endpoint endx="236" endy="85" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="kOXTy1K6CLkK" widgetaid="J8SsPhfYKZmW" xmi.id="qQVHgEoIVwSL" type="503" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="J8SsPhfYKZmW" linecolor="none" totalcounta="2" xmi.id="qQVHgEoIVwSL" widgetbid="kOXTy1K6CLkK" totalcountb="3" type="503" linewidth="none" >
           <linepath>
            <startpoint startx="426" starty="101" />
            <endpoint endx="426" endy="246" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="HRweRDeLQktl" widgetaid="kOXTy1K6CLkK" xmi.id="cWADNpRehIFv" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="kOXTy1K6CLkK" linecolor="none" totalcounta="2" xmi.id="cWADNpRehIFv" widgetbid="HRweRDeLQktl" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="511" starty="262" />
+           <startpoint startx="511" starty="260" />
            <endpoint endx="597" endy="260" />
           </linepath>
          </assocwidget>
         </associations>
        </diagram>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-       <diagram snapgrid="0" showattsig="1" fillcolor="#ffff00" linewidth="0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="944" snapy="10" showatts="1" xmi.id="DcCqLQWgvQ9f" documentation="" type="1" showops="1" showpackage="1" name="Cost Analysis" localid="" showstereotype="1" showscope="1" snapcsgrid="0" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="851" >
-=======
-       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="1" showstereotype="1" name="Cost Analysis" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="550" canvaswidth="824" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="DcCqLQWgvQ9f" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="0" snapy="10" linewidth="0" showattsig="1" showpubliconly="0" showpackage="1" showstereotype="1" name="Cost Analysis" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="600" canvaswidth="1160" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="DcCqLQWgvQ9f" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
         <widgets>
-         <classwidget usesdiagramfillcolor="1" width="119" showattsigs="601" x="431" fillcolor="none" y="281" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="HRweRDeLQktl" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="1" width="78" showattsigs="601" x="47" fillcolor="none" y="128" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="QuCpOvJF0Q5L" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="152" showattsigs="601" x="209" fillcolor="#ffffc0" y="129" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="2QrSuVLLe0lg" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="94" showattsigs="601" x="443" fillcolor="#ffffc0" y="207" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="y1Sxm7xSsawe" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="109" showattsigs="601" x="435" fillcolor="#ffffc0" y="128" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="1" showattributes="1" isinstance="0" xmi.id="UMEqzuewt7te" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="431" showattsigs="601" y="281" showattributes="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" width="119" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="HRweRDeLQktl" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="0" x="47" showattsigs="601" y="128" showattributes="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" width="78" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="QuCpOvJF0Q5L" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="209" showattsigs="601" y="129" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="152" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="2QrSuVLLe0lg" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="443" showattsigs="601" y="207" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="94" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="y1Sxm7xSsawe" showscope="1" height="32" showopsigs="601" />
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="0" x="435" showattsigs="601" y="128" showattributes="1" font="Sans Serif,10,-1,5,50,0,0,0,0,0" width="109" isinstance="0" usefillcolor="1" fillcolor="#ffffc0" xmi.id="UMEqzuewt7te" showscope="1" height="32" showopsigs="601" />
         </widgets>
         <messages/>
         <associations>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="HRweRDeLQktl" widgetaid="y1Sxm7xSsawe" xmi.id="Cq64Q1iClj5L" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="y1Sxm7xSsawe" linecolor="none" totalcounta="2" xmi.id="Cq64Q1iClj5L" widgetbid="HRweRDeLQktl" totalcountb="2" type="512" linewidth="none" >
           <linepath>
            <startpoint startx="490" starty="239" />
            <endpoint endx="490" endy="281" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="y1Sxm7xSsawe" widgetaid="UMEqzuewt7te" xmi.id="Nvy7c4Sh5kt2" type="501" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="UMEqzuewt7te" linecolor="none" totalcounta="2" xmi.id="Nvy7c4Sh5kt2" widgetbid="y1Sxm7xSsawe" totalcountb="2" type="501" linewidth="none" >
           <linepath>
-           <startpoint startx="489" starty="160" />
+           <startpoint startx="490" starty="160" />
            <endpoint endx="490" endy="207" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2QrSuVLLe0lg" widgetaid="QuCpOvJF0Q5L" xmi.id="JbmI0V1A8Uxm" type="501" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="QuCpOvJF0Q5L" linecolor="none" totalcounta="2" xmi.id="JbmI0V1A8Uxm" widgetbid="2QrSuVLLe0lg" totalcountb="2" type="501" linewidth="none" >
           <linepath>
-           <startpoint startx="125" starty="144" />
+           <startpoint startx="125" starty="145" />
            <endpoint endx="209" endy="145" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="UMEqzuewt7te" widgetaid="2QrSuVLLe0lg" xmi.id="BI2Jk04C1b3W" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="2QrSuVLLe0lg" linecolor="none" totalcounta="2" xmi.id="BI2Jk04C1b3W" widgetbid="UMEqzuewt7te" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="361" starty="145" />
+           <startpoint startx="361" starty="144" />
            <endpoint endx="435" endy="144" />
           </linepath>
          </assocwidget>
         </associations>
        </diagram>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-       <diagram snapgrid="0" showattsig="1" fillcolor="#ffff00" linewidth="0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="999" snapy="10" showatts="1" xmi.id="WGfevf8IyFPY" documentation="" type="1" showops="1" showpackage="1" name="Materials" localid="" showstereotype="1" showscope="1" snapcsgrid="0" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="835" >
-        <widgets>
-         <classwidget usesdiagramfillcolor="0" width="118" showattsigs="601" x="161" fillcolor="#ffff00" y="70" showopsigs="601" linewidth="none" height="133" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="tuIzeslDqJW5" showoperations="1" showpackage="1" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="0" width="182" showattsigs="601" x="627" fillcolor="#ffff00" y="115" showopsigs="601" linewidth="none" height="77" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="yJlPDdIdL0Bf" showoperations="1" showpackage="1" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <classwidget usesdiagramfillcolor="1" width="115" showattsigs="601" x="880" fillcolor="none" y="130" showopsigs="601" linewidth="none" height="35" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="Kj88Iy3nRzm8" showoperations="1" showpackage="1" showscope="1" showstereotype="1" usesdiagramusefillcolor="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="none" />
-         <classwidget usesdiagramfillcolor="0" width="172" showattsigs="601" x="362" fillcolor="#ffff00" y="102" showopsigs="601" linewidth="none" height="91" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="4trT6VkioirU" showoperations="1" showpackage="1" showscope="1" showstereotype="1" usesdiagramusefillcolor="0" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
-         <notewidget usesdiagramfillcolor="1" width="209" x="414" fillcolor="none" y="267" linewidth="none" height="121" usefillcolor="1" isinstance="0" xmi.id="U0lbjUxrMtWC" showstereotype="1" text="The status will represent the status of the material assignment regarding it has been received, pending, ordered, or any status subject to the needs of material related to the start of a task" usesdiagramusefillcolor="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" showpubliconly="1" showpackage="1" showstereotype="1" name="Materials" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="533" canvaswidth="999" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="WGfevf8IyFPY" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
+       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="0" snapy="10" linewidth="0" showattsig="1" showpubliconly="0" showpackage="1" showstereotype="1" name="Materials" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" canvasheight="600" canvaswidth="1160" localid="" snapcsgrid="0" showgrid="0" showops="1" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="WGfevf8IyFPY" documentation="" showscope="1" snapgrid="0" showatts="1" type="1" >
         <widgets>
          <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="1" x="161" showattsigs="601" showstereotype="1" y="70" showattributes="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" width="118" isinstance="0" usefillcolor="1" fillcolor="#ffff00" xmi.id="tuIzeslDqJW5" showscope="1" height="133" showopsigs="601" />
          <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="1" x="627" showattsigs="601" showstereotype="1" y="115" showattributes="1" font="DejaVu Sans,8,-1,5,75,0,0,0,0,0" width="182" isinstance="0" usefillcolor="1" fillcolor="#ffff00" xmi.id="yJlPDdIdL0Bf" showscope="1" height="91" showopsigs="601" />
-         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="1" x="880" showattsigs="601" showstereotype="1" y="130" showattributes="1" font="DejaVu Sans,8,-1,5,75,0,0,0,0,0" width="115" isinstance="0" usefillcolor="1" fillcolor="#ffff00" xmi.id="Kj88Iy3nRzm8" showscope="1" height="35" showopsigs="601" />
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="1" x="880" showattsigs="601" showstereotype="1" y="130" showattributes="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" width="115" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="Kj88Iy3nRzm8" showscope="1" height="35" showopsigs="601" />
          <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="1" x="362" showattsigs="601" showstereotype="1" y="102" showattributes="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" width="172" isinstance="0" usefillcolor="1" fillcolor="#ffff00" xmi.id="4trT6VkioirU" showscope="1" height="91" showopsigs="601" />
          <notewidget width="209" showstereotype="1" x="414" noteType="0" y="267" usesdiagramusefillcolor="1" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="121" linecolor="none" xmi.id="U0lbjUxrMtWC" usefillcolor="1" linewidth="none" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" text="The status will represent the status of the material assignment regarding it has been received, pending, ordered, or any status subject to the needs of material related to the start of a task" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
         </widgets>
         <messages/>
         <associations>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="4trT6VkioirU" widgetaid="tuIzeslDqJW5" xmi.id="v7ZmQIcdpwvq" type="510" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="tuIzeslDqJW5" linecolor="none" totalcounta="2" xmi.id="v7ZmQIcdpwvq" widgetbid="4trT6VkioirU" totalcountb="2" type="510" linewidth="none" >
           <linepath>
-           <startpoint startx="279" starty="136" />
+           <startpoint startx="279" starty="147" />
            <endpoint endx="362" endy="147" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="yJlPDdIdL0Bf" widgetaid="4trT6VkioirU" xmi.id="D90wRh3PO3aU" type="512" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="4trT6VkioirU" linecolor="none" totalcounta="2" xmi.id="D90wRh3PO3aU" widgetbid="yJlPDdIdL0Bf" totalcountb="2" type="512" linewidth="none" >
           <linepath>
-           <startpoint startx="534" starty="147" />
+           <startpoint startx="534" starty="153" />
            <endpoint endx="627" endy="153" />
           </linepath>
          </assocwidget>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-         <assocwidget totalcounta="2" indexa="1" totalcountb="0" indexb="0" linewidth="none" widgetbid="Kj88Iy3nRzm8" widgetaid="Kj88Iy3nRzm8" xmi.id="vwyANGEvohUR" type="512" linecolor="none" >
-=======
          <assocwidget indexa="1" indexb="0" widgetaid="Kj88Iy3nRzm8" linecolor="none" totalcounta="2" xmi.id="vwyANGEvohUR" widgetbid="Kj88Iy3nRzm8" totalcountb="0" type="512" linewidth="none" >
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
           <linepath>
            <startpoint startx="908" starty="130" />
            <endpoint endx="966" endy="130" />
            <point x="908" y="80" />
            <point x="966" y="80" />
           </linepath>
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-          <floatingtext usesdiagramfillcolor="1" width="45" x="908" fillcolor="none" y="105" linewidth="none" posttext="" role="703" height="18" usefillcolor="1" pretext="" isinstance="0" xmi.id="fU5zAvq4H05M" showstereotype="1" text="parent" usesdiagramusefillcolor="1" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" linecolor="none" />
-=======
-          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="908" showstereotype="1" y="105" text="parent" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" pretext="" role="703" width="45" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="mM0rpZOuHhSI" height="18" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="908" showstereotype="1" y="105" text="parent" font="DejaVu Sans,8,-1,5,50,0,0,0,0,0" pretext="" role="703" width="45" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="4FIhv3buqpm0" height="18" />
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="yJlPDdIdL0Bf" widgetaid="Kj88Iy3nRzm8" xmi.id="zLpn2HDx3TTf" type="501" linecolor="none" >
+         <assocwidget indexa="1" indexb="1" widgetaid="Kj88Iy3nRzm8" linecolor="none" totalcounta="2" xmi.id="zLpn2HDx3TTf" widgetbid="yJlPDdIdL0Bf" totalcountb="2" type="501" linewidth="none" >
           <linepath>
-           <startpoint startx="880" starty="147" />
+           <startpoint startx="880" starty="153" />
            <endpoint endx="809" endy="153" />
           </linepath>
          </assocwidget>
-         <assocwidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" linewidth="none" widgetbid="U0lbjUxrMtWC" widgetaid="4trT6VkioirU" roleBdoc="" documentation="" roleAdoc="" type="513" changeabilityA="900" changeabilityB="900" linecolor="none" visibilityA="200" >
+         <assocwidget indexa="1" indexb="1" visibilityA="0" widgetaid="4trT6VkioirU" visibilityB="0" roleBdoc="" roleAdoc="" linecolor="none" changeabilityA="900" totalcounta="2" changeabilityB="900" widgetbid="U0lbjUxrMtWC" totalcountb="2" type="513" documentation="" linewidth="none" >
           <linepath>
-           <startpoint startx="448" starty="193" />
+           <startpoint startx="518" starty="193" />
            <endpoint endx="518" endy="267" />
           </linepath>
          </assocwidget>
@@ -2299,27 +2097,23 @@ Tamen hai que introducir a restriccion de que non se pode definir un obxecto Adv
       </diagrams>
      </XMI.extension>
     </UML:Model>
-    <UML:Model stereotype="folder" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="Use Case View" isRoot="false" isAbstract="false" name="Use Case View" >
+    <UML:Model stereotype="folder" visibility="public" isSpecification="false" namespace="m1" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Use Case View" name="Use Case View" >
      <UML:Namespace.ownedElement/>
     </UML:Model>
-    <UML:Model stereotype="folder" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="Component View" isRoot="false" isAbstract="false" name="Component View" >
+    <UML:Model stereotype="folder" visibility="public" isSpecification="false" namespace="m1" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Component View" name="Component View" >
      <UML:Namespace.ownedElement/>
     </UML:Model>
-    <UML:Model stereotype="folder" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="Deployment View" isRoot="false" isAbstract="false" name="Deployment View" >
+    <UML:Model stereotype="folder" visibility="public" isSpecification="false" namespace="m1" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Deployment View" name="Deployment View" >
      <UML:Namespace.ownedElement/>
     </UML:Model>
-    <UML:Model stereotype="folder" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="Entity Relationship Model" isRoot="false" isAbstract="false" name="Entity Relationship Model" >
+    <UML:Model stereotype="folder" visibility="public" isSpecification="false" namespace="m1" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Entity Relationship Model" name="Entity Relationship Model" >
      <UML:Namespace.ownedElement/>
     </UML:Model>
    </UML:Namespace.ownedElement>
   </UML:Model>
  </XMI.content>
  <XMI.extensions xmi.extender="umbrello" >
-<<<<<<< HEAD:doc/src/technical/uml-analysis.xmi
-  <docsettings viewid="em0PEuZNPWBl" documentation="" uniqueid="eldwxH6Pgo2s" />
-=======
-  <docsettings viewid="WGfevf8IyFPY" uniqueid="5j56B1zW2E4a" documentation="" />
->>>>>>> ItEr33S02AnaliseItEr32S02: Added Missing attribute unit types in Material:doc/src/technical/uml-analysis.xmi
+  <docsettings viewid="WGfevf8IyFPY" uniqueid="20d1uHuSZRvw" documentation="" />
   <listview>
    <listitem open="1" type="800" label="Views" >
     <listitem open="1" type="801" id="Logical View" >
@@ -2444,7 +2238,7 @@ Tamen hai que introducir a restriccion de que non se pode definir un obxecto Adv
       <listitem open="0" type="814" id="Oy5plFJc06dX" />
       <listitem open="0" type="814" id="tKRurLs86uKm" />
       <listitem open="0" type="814" id="7DCwhDhGu9Ej" />
-      <listitem open="0" type="814" id="5j56B1zW2E4a" />
+      <listitem open="0" type="814" id="20d1uHuSZRvw" />
      </listitem>
      <listitem open="1" type="813" id="4trT6VkioirU" >
       <listitem open="0" type="814" id="57lb10WsuoNN" />