From: Leandro Lucarella <llucax@gmail.com>
Date: Thu, 28 Apr 2005 15:23:20 +0000 (+0000)
Subject: Se embebe el Telefono en Direccion y se pone la Direccion como una composición.
X-Git-Tag: svn_import~566
X-Git-Url: https://git.llucax.com/z.facultad/75.10/miklolife.git/commitdiff_plain/a80f6cdb43d49e23d30854b4c44679d7d625ad05?ds=inline

Se embebe el Telefono en Direccion y se pone la Direccion como una composición.
---

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 1d0dc32..5c2490c 100644
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.37046089768409729"/>
+          <dia:real val="0.40462720394134521"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -71,13 +71,13 @@
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - Class" version="0" id="O0">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.6,23.35"/>
+        <dia:point val="35.7,23.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.55,23.3;39.15,25.2"/>
+        <dia:rectangle val="35.65,23.5;40.25,25.4"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="34.6,23.35"/>
+        <dia:point val="35.7,23.55"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.5"/>
@@ -172,13 +172,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="33.3,8.95"/>
+        <dia:point val="29.95,13.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.25,8.9;45.75,16.2"/>
+        <dia:rectangle val="29.9,13.15;42.4,20.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="33.3,8.95"/>
+        <dia:point val="29.95,13.2"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="12.4"/>
@@ -435,13 +435,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="21.6,23.05"/>
+        <dia:point val="23.6,22.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.55,23;30.3,28.7"/>
+        <dia:rectangle val="23.55,22.7;32.3,28.4"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="21.6,23.05"/>
+        <dia:point val="23.6,22.75"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -994,13 +994,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="-4.5,2.75"/>
+        <dia:point val="-5.1,2.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.55,2.7;1.35,6"/>
+        <dia:rectangle val="-5.15,2.5;0.75,5.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-4.5,2.75"/>
+        <dia:point val="-5.1,2.55"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.7999999999999998"/>
@@ -1142,13 +1142,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.375,0.1"/>
+        <dia:point val="36.275,5.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.325,0.05;40.025,3.35"/>
+        <dia:rectangle val="36.225,5.3;43.925,8.6"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="32.375,0.1"/>
+        <dia:point val="36.275,5.35"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -1584,16 +1584,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.5,16.15"/>
+        <dia:point val="36.15,20.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.875,16.1;40.35,23.57"/>
+        <dia:rectangle val="27.875,20.35;37,23.57"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="39.5,16.15"/>
-        <dia:point val="39.5,22.72"/>
-        <dia:point val="25.925,22.72"/>
-        <dia:point val="25.925,23.05"/>
+        <dia:point val="36.15,20.4"/>
+        <dia:point val="36.15,22.72"/>
+        <dia:point val="27.925,22.72"/>
+        <dia:point val="27.925,22.75"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -1619,16 +1619,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.5,16.15"/>
+        <dia:point val="36.15,20.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.8,16.1;40.35,23.57"/>
+        <dia:rectangle val="35.3,20.35;38,23.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="39.5,16.15"/>
-        <dia:point val="39.5,22.72"/>
-        <dia:point val="36.85,22.72"/>
-        <dia:point val="36.85,23.35"/>
+        <dia:point val="36.15,20.4"/>
+        <dia:point val="36.15,22.72"/>
+        <dia:point val="37.95,22.72"/>
+        <dia:point val="37.95,23.55"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -1654,13 +1654,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="44.115,-2.04"/>
+        <dia:point val="44.715,11.06"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="44.065,-2.09;51.765,1.21"/>
+        <dia:rectangle val="44.665,11.01;52.365,14.31"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="44.115,-2.04"/>
+        <dia:point val="44.715,11.06"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -1802,13 +1802,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="42.415,25.4"/>
+        <dia:point val="43.665,25.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="42.365,25.35;51.115,30.25"/>
+        <dia:rectangle val="43.615,25.2;52.365,30.1"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="42.415,25.4"/>
+        <dia:point val="43.665,25.25"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -1996,16 +1996,16 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.5,16.15"/>
+        <dia:point val="36.15,20.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.65,16.1;46.79,25.45"/>
+        <dia:rectangle val="35.3,20.35;48.04,25.3"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="39.5,16.15"/>
-        <dia:point val="39.5,22.72"/>
-        <dia:point val="46.74,22.72"/>
-        <dia:point val="46.74,25.4"/>
+        <dia:point val="36.15,20.4"/>
+        <dia:point val="36.15,22.72"/>
+        <dia:point val="47.99,22.72"/>
+        <dia:point val="47.99,25.25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2031,13 +2031,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="10.165,20.76"/>
+        <dia:point val="11.515,20.46"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.115,20.71;18.865,24.01"/>
+        <dia:rectangle val="11.465,20.41;20.215,23.71"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="10.165,20.76"/>
+        <dia:point val="11.515,20.46"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.6500000000000004"/>
@@ -2182,13 +2182,13 @@
         <dia:point val="11.3,12.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.45,12.8;14.54,20.81"/>
+        <dia:rectangle val="10.45,12.8;15.89,20.51"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="11.3,12.85"/>
         <dia:point val="11.3,15.0325"/>
-        <dia:point val="14.49,15.0325"/>
-        <dia:point val="14.49,20.76"/>
+        <dia:point val="15.84,15.0325"/>
+        <dia:point val="15.84,20.46"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2214,13 +2214,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="3.38,16.37"/>
+        <dia:point val="3.03,17.32"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="3.33,16.32;13.78,18.22"/>
+        <dia:rectangle val="2.98,17.27;13.43,19.17"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="3.38,16.37"/>
+        <dia:point val="3.03,17.32"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="10.35"/>
@@ -2318,13 +2318,13 @@
         <dia:point val="11.3,12.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.505,12.8;12.15,16.42"/>
+        <dia:rectangle val="8.155,12.8;12.15,17.37"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="11.3,12.85"/>
         <dia:point val="11.3,15.0325"/>
-        <dia:point val="8.555,15.0325"/>
-        <dia:point val="8.555,16.37"/>
+        <dia:point val="8.205,15.0325"/>
+        <dia:point val="8.205,17.32"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -2350,13 +2350,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.585,27.52"/>
+        <dia:point val="-5.485,30.02"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.635,27.47;7.565,32.37"/>
+        <dia:rectangle val="-5.535,29.97;7.665,34.87"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5.585,27.52"/>
+        <dia:point val="-5.485,30.02"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="13.1"/>
@@ -2692,14 +2692,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O19">
       <dia:attribute name="obj_pos">
-        <dia:point val="7.615,28.22"/>
+        <dia:point val="7.615,30.72"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.565,25.75;11.225,29.07"/>
+        <dia:rectangle val="7.565,25.75;11.225,31.57"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="7.615,28.22"/>
-        <dia:point val="8.96521,28.22"/>
+        <dia:point val="7.615,30.72"/>
+        <dia:point val="8.96521,30.72"/>
         <dia:point val="8.96521,26.5"/>
         <dia:point val="10.475,26.5"/>
       </dia:attribute>
@@ -2757,13 +2757,13 @@
         <dia:point val="20.025,26.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.975,25.75;21.95,28.2"/>
+        <dia:rectangle val="19.975,25.75;23.95,27.9"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.025,26.5"/>
         <dia:point val="20.8125,26.5"/>
-        <dia:point val="20.8125,27.35"/>
-        <dia:point val="21.6,27.35"/>
+        <dia:point val="20.8125,27.05"/>
+        <dia:point val="23.6,27.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -2816,21 +2816,19 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="44.115,-1.34"/>
+        <dia:point val="44.715,11.76"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.225,-2.09;44.815,1.65"/>
+        <dia:rectangle val="39.325,7.8;45.415,12.61"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="44.115,-1.34"/>
-        <dia:point val="42.045,-1.34"/>
-        <dia:point val="42.045,0.8"/>
-        <dia:point val="39.975,0.8"/>
+        <dia:point val="44.715,11.76"/>
+        <dia:point val="40.075,11.76"/>
+        <dia:point val="40.075,8.55"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
-        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -2870,83 +2868,21 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O10" connection="3"/>
-        <dia:connection handle="1" to="O6" connection="4"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O22">
-      <dia:attribute name="obj_pos">
-        <dia:point val="39.5,8.95"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="35.425,2.55;40.2,10.55"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="39.5,8.95"/>
-        <dia:point val="39.5,6.98251"/>
-        <dia:point val="36.175,6.98251"/>
-        <dia:point val="36.175,3.3"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="1"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O1" connection="1"/>
         <dia:connection handle="1" to="O6" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O23">
+    <dia:object type="UML - Association" version="0" id="O22">
       <dia:attribute name="obj_pos">
-        <dia:point val="42.415,25.4"/>
+        <dia:point val="43.665,25.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.05,23.3;43.115,26.25"/>
+        <dia:rectangle val="40.15,23.5;44.365,26.1"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="42.415,25.4"/>
-        <dia:point val="40.7575,25.4"/>
-        <dia:point val="40.7575,24.05"/>
-        <dia:point val="39.1,24.05"/>
+        <dia:point val="43.665,25.25"/>
+        <dia:point val="41.9325,25.25"/>
+        <dia:point val="41.9325,24.25"/>
+        <dia:point val="40.2,24.25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -2994,7 +2930,7 @@
         <dia:connection handle="1" to="O0" connection="4"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O24">
+    <dia:object type="UML - Association" version="0" id="O23">
       <dia:attribute name="obj_pos">
         <dia:point val="-1.925,15.45"/>
       </dia:attribute>
@@ -3053,18 +2989,18 @@
         <dia:connection handle="1" to="O18" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O25">
+    <dia:object type="UML - Association" version="0" id="O24">
       <dia:attribute name="obj_pos">
         <dia:point val="5.775,5.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.965,4.6;6.825,28.37"/>
+        <dia:rectangle val="1.015,4.6;6.825,30.87"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="5.775,5.35"/>
-        <dia:point val="2.315,5.35"/>
-        <dia:point val="2.315,27.52"/>
-        <dia:point val="1.015,27.52"/>
+        <dia:point val="1.74666,5.35"/>
+        <dia:point val="1.74666,30.02"/>
+        <dia:point val="1.065,30.02"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3115,17 +3051,17 @@
         <dia:connection handle="1" to="O17" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O26">
+    <dia:object type="UML - Association" version="0" id="O25">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.585,28.22"/>
+        <dia:point val="-5.485,30.72"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.635,14.2;-4.475,29.07"/>
+        <dia:rectangle val="-6.535,14.2;-4.475,31.57"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-5.585,28.22"/>
-        <dia:point val="-6.585,28.22"/>
-        <dia:point val="-6.585,14.95"/>
+        <dia:point val="-5.485,30.72"/>
+        <dia:point val="-6.485,30.72"/>
+        <dia:point val="-6.485,14.95"/>
         <dia:point val="-4.825,14.95"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -3174,19 +3110,19 @@
         <dia:connection handle="1" to="O3" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O27">
+    <dia:object type="UML - Association" version="0" id="O26">
       <dia:attribute name="obj_pos">
         <dia:point val="-4.825,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.875,5.2;-0.85,14.6"/>
+        <dia:rectangle val="-5.875,5;-1.45,14.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4.825,13.75"/>
         <dia:point val="-5.825,13.75"/>
-        <dia:point val="-5.825,9.85"/>
-        <dia:point val="-1.6,9.85"/>
-        <dia:point val="-1.6,5.95"/>
+        <dia:point val="-5.825,9.75"/>
+        <dia:point val="-2.2,9.75"/>
+        <dia:point val="-2.2,5.75"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3235,18 +3171,18 @@
         <dia:connection handle="1" to="O5" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O28">
+    <dia:object type="UML - Association" version="0" id="O27">
       <dia:attribute name="obj_pos">
-        <dia:point val="-4.5,2.75"/>
+        <dia:point val="-5.1,2.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.55,-5.31749;48.665,4.35"/>
+        <dia:rectangle val="-5.15,-1.26749;49.265,11.81"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-4.5,2.75"/>
-        <dia:point val="-4.5,-4.56749"/>
-        <dia:point val="47.915,-4.56749"/>
-        <dia:point val="47.915,-2.04"/>
+        <dia:point val="-5.1,2.55"/>
+        <dia:point val="-5.1,-0.51749"/>
+        <dia:point val="48.515,-0.51749"/>
+        <dia:point val="48.515,11.06"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3297,15 +3233,15 @@
         <dia:connection handle="1" to="O10" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O29">
+    <dia:object type="UML - Class" version="0" id="O28">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.215,30.5325"/>
+        <dia:point val="40.015,31.0825"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.165,30.4825;41.865,33.7825"/>
+        <dia:rectangle val="39.965,31.0325;47.665,34.3325"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="34.215,30.5325"/>
+        <dia:point val="40.015,31.0825"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -3445,169 +3381,21 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O30">
-      <dia:attribute name="obj_pos">
-        <dia:point val="13.2508,-1.24249"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.2008,-1.29249;28.2008,2.00751"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="13.2508,-1.24249"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="14.9"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#Telefono#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="comment">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_attributes">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_attributes">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="attributes">
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#tipo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#enum(particular, laboral, celular)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Tipo de telefono.#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#numero#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Numero de telefono#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O31">
+    <dia:object type="UML - Class" version="0" id="O29">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.1008,11.8075"/>
+        <dia:point val="21.6508,0.8575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.0508,11.7575;31.2008,18.2575"/>
+        <dia:rectangle val="21.6008,0.8075;32.7508,8.1075"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="20.1008,11.8075"/>
+        <dia:point val="21.6508,0.8575"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.049999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="6.4000000000000004"/>
+        <dia:real val="7.1999999999999993"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Direccion#</dia:string>
@@ -3826,149 +3614,51 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-      </dia:attribute>
-      <dia:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O32">
-      <dia:attribute name="obj_pos">
-        <dia:point val="20.7008,1.95751"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.6508,1.90751;33.35,11.25"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="20.7008,1.95751"/>
-        <dia:point val="20.7008,9.65"/>
-        <dia:point val="33.3,9.65"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#telefono#</dia:string>
           </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
           </dia:attribute>
-          <dia:attribute name="multiplicity">
+          <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
+          <dia:attribute name="comment">
+            <dia:string>#Teléfono del domicilio#</dia:string>
           </dia:attribute>
-          <dia:attribute name="aggregate">
+          <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O30" connection="6"/>
-        <dia:connection handle="1" to="O1" connection="3"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O33">
-      <dia:attribute name="obj_pos">
-        <dia:point val="31.1508,12.5075"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.1008,11.7575;33.65,14.1"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="31.1508,12.5075"/>
-        <dia:point val="32.2254,12.5075"/>
-        <dia:point val="32.2254,13.25"/>
-        <dia:point val="33.3,13.25"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
+          <dia:attribute name="abstract">
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
+          <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
         </dia:composite>
       </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O31" connection="4"/>
-        <dia:connection handle="1" to="O1" connection="14"/>
-      </dia:connections>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O34">
+    <dia:object type="UML - Association" version="0" id="O30">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.7008,-1.24249"/>
+        <dia:point val="27.1758,8.0575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.65,-4.76749;21.4008,4.35"/>
+        <dia:rectangle val="27.1258,8.0075;30.7,18.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="20.7008,-1.24249"/>
-        <dia:point val="20.7008,-4.01749"/>
-        <dia:point val="-1.6,-4.01749"/>
-        <dia:point val="-1.6,2.75"/>
+        <dia:point val="27.1758,8.0575"/>
+        <dia:point val="27.1758,17.5"/>
+        <dia:point val="29.95,17.5"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
         <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -4002,29 +3692,31 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+            <dia:enum val="2"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O30" connection="1"/>
-        <dia:connection handle="1" to="O5" connection="1"/>
+        <dia:connection handle="0" to="O29" connection="6"/>
+        <dia:connection handle="1" to="O1" connection="14"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O35">
+    <dia:object type="UML - Association" version="0" id="O31">
       <dia:attribute name="obj_pos">
-        <dia:point val="25.6258,18.2075"/>
+        <dia:point val="21.6508,1.5575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.25,5.9;26.3258,20.6075"/>
+        <dia:rectangle val="-2.95,0.5075;22.0008,3.3"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="25.6258,18.2075"/>
-        <dia:point val="25.6258,19.2075"/>
-        <dia:point val="1.3,19.2075"/>
-        <dia:point val="1.3,5.95"/>
+        <dia:point val="21.6508,1.5575"/>
+        <dia:point val="20.6508,1.5575"/>
+        <dia:point val="20.6508,0.5575"/>
+        <dia:point val="-2.2,0.5575"/>
+        <dia:point val="-2.2,2.55"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
@@ -4061,25 +3753,25 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+            <dia:enum val="2"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O31" connection="6"/>
-        <dia:connection handle="1" to="O5" connection="7"/>
+        <dia:connection handle="0" to="O29" connection="3"/>
+        <dia:connection handle="1" to="O5" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O36">
+    <dia:object type="UML - Association" version="0" id="O32">
       <dia:attribute name="obj_pos">
-        <dia:point val="1.3,3.45"/>
+        <dia:point val="0.7,3.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.25,2.7;12,6.25"/>
+        <dia:rectangle val="0.65,2.5;12,6.25"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="1.3,3.45"/>
-        <dia:point val="11.3,3.45"/>
+        <dia:point val="0.7,3.25"/>
+        <dia:point val="11.3,3.25"/>
         <dia:point val="11.3,4.65"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -4127,18 +3819,18 @@
         <dia:connection handle="1" to="O7" connection="1"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O37">
+    <dia:object type="UML - Association" version="0" id="O33">
       <dia:attribute name="obj_pos">
         <dia:point val="16.825,5.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.775,4.6;21.95,24.6"/>
+        <dia:rectangle val="16.775,4.6;23.95,24.3"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="16.825,5.35"/>
-        <dia:point val="19.515,5.35"/>
-        <dia:point val="19.515,23.75"/>
-        <dia:point val="21.6,23.75"/>
+        <dia:point val="20.8967,5.35"/>
+        <dia:point val="20.8967,23.45"/>
+        <dia:point val="23.6,23.45"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4189,18 +3881,18 @@
         <dia:connection handle="1" to="O2" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O38">
+    <dia:object type="UML - Association" version="0" id="O34">
       <dia:attribute name="obj_pos">
-        <dia:point val="21.6,28.65"/>
+        <dia:point val="23.6,28.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.85,27.9;32.425,34.0575"/>
+        <dia:rectangle val="22.85,27.6;34.425,34.0575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="21.6,28.65"/>
-        <dia:point val="21.6,34.0075"/>
-        <dia:point val="25.925,34.0075"/>
-        <dia:point val="25.925,28.65"/>
+        <dia:point val="23.6,28.35"/>
+        <dia:point val="23.6,34.0075"/>
+        <dia:point val="27.925,34.0075"/>
+        <dia:point val="27.925,28.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4251,18 +3943,18 @@
         <dia:connection handle="1" to="O2" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O39">
+    <dia:object type="UML - Association" version="0" id="O35">
       <dia:attribute name="obj_pos">
         <dia:point val="15.25,31.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.2,31.35;38.715,36.1325"/>
+        <dia:rectangle val="15.2,31.35;44.515,36.6825"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="15.25,31.4"/>
-        <dia:point val="15.25,34.3575"/>
-        <dia:point val="38.015,34.3575"/>
-        <dia:point val="38.015,33.7325"/>
+        <dia:point val="15.25,35.0575"/>
+        <dia:point val="43.815,35.0575"/>
+        <dia:point val="43.815,34.2825"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4310,21 +4002,21 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O4" connection="6"/>
-        <dia:connection handle="1" to="O29" connection="6"/>
+        <dia:connection handle="1" to="O28" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O40">
+    <dia:object type="UML - Association" version="0" id="O36">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.25,28.15"/>
+        <dia:point val="32.25,27.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.5,27.4;39.965,32.0825"/>
+        <dia:rectangle val="31.5,27.1;41.8151,32.6325"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.25,28.15"/>
-        <dia:point val="33.215,28.15"/>
-        <dia:point val="33.215,31.2325"/>
-        <dia:point val="34.215,31.2325"/>
+        <dia:point val="32.25,27.85"/>
+        <dia:point val="35.0651,27.85"/>
+        <dia:point val="35.0651,31.7825"/>
+        <dia:point val="40.015,31.7825"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4372,21 +4064,21 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O2" connection="17"/>
-        <dia:connection handle="1" to="O29" connection="3"/>
+        <dia:connection handle="1" to="O28" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O41">
+    <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.375,0.8"/>
+        <dia:point val="32.7008,1.5575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.1008,-1.29249;32.725,1.65"/>
+        <dia:rectangle val="32.6508,0.8075;37.025,8.9"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="32.375,0.8"/>
-        <dia:point val="30.2629,0.8"/>
-        <dia:point val="30.2629,-0.54249"/>
-        <dia:point val="28.1508,-0.54249"/>
+        <dia:point val="32.7008,1.5575"/>
+        <dia:point val="34.4879,1.5575"/>
+        <dia:point val="34.4879,8.05"/>
+        <dia:point val="36.275,8.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4425,84 +4117,27 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O6" connection="3"/>
-        <dia:connection handle="1" to="O30" connection="4"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O42">
-      <dia:attribute name="obj_pos">
-        <dia:point val="25.6258,11.8075"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.5758,2.05;32.725,13.4075"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="25.6258,11.8075"/>
-        <dia:point val="25.6258,2.8"/>
-        <dia:point val="32.375,2.8"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+            <dia:enum val="2"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O31" connection="1"/>
+        <dia:connection handle="0" to="O29" connection="4"/>
         <dia:connection handle="1" to="O6" connection="10"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O43">
+    <dia:object type="UML - Association" version="0" id="O38">
       <dia:attribute name="obj_pos">
-        <dia:point val="42.415,27.3"/>
+        <dia:point val="43.665,27.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.2,25.8;43.115,28.15"/>
+        <dia:rectangle val="32.2,25.5;44.365,28"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="42.415,27.3"/>
-        <dia:point val="36.3325,27.3"/>
-        <dia:point val="36.3325,26.55"/>
-        <dia:point val="30.25,26.55"/>
+        <dia:point val="43.665,27.15"/>
+        <dia:point val="37.9575,27.15"/>
+        <dia:point val="37.9575,26.25"/>
+        <dia:point val="32.25,26.25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
diff --git a/diagramas/der.dia b/diagramas/der.dia
index ea19a34..299506d 100644
--- a/diagramas/der.dia
+++ b/diagramas/der.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.36051851511001587"/>
+          <dia:real val="0.36051854491233826"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -196,13 +196,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.45,8.5"/>
+        <dia:point val="38.85,6.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.4,8.45;51.9,18.15"/>
+        <dia:rectangle val="38.8,6.75;51.3,16.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="39.45,8.5"/>
+        <dia:point val="38.85,6.8"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="12.4"/>
@@ -1228,7 +1228,7 @@
         <dia:point val="1.5,-0.85"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.45,-0.9;9.85,5.6"/>
+        <dia:rectangle val="1.45,-0.9;9.85,4.8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="1.5,-0.85"/>
@@ -1237,7 +1237,7 @@
         <dia:real val="8.3000000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="6.4000000000000004"/>
+        <dia:real val="5.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>
@@ -1410,29 +1410,6 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#idTelefono#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>#FK#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#idDireccion#</dia:string>
@@ -1468,7 +1445,7 @@
         <dia:point val="33.525,-1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="33.475,-1.05;41.875,4.65"/>
+        <dia:rectangle val="33.475,-1.05;41.875,3.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="33.525,-1"/>
@@ -1477,7 +1454,7 @@
         <dia:real val="8.3000000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="5.5999999999999996"/>
+        <dia:real val="4.8000000000000007"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Cap#</dia:string>
@@ -1627,29 +1604,6 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#idTelefono#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>#FK#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#idDireccion#</dia:string>
@@ -2060,13 +2014,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="50.415,-2.29"/>
+        <dia:point val="18.515,-1.74"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="50.365,-2.34;58.065,2.56"/>
+        <dia:rectangle val="18.465,-1.79;26.165,3.11"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="50.415,-2.29"/>
+        <dia:point val="18.515,-1.74"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5999999999999996"/>
@@ -3246,16 +3200,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="50.415,2.01"/>
+        <dia:point val="26.115,2.56"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="41.775,-1.05;51.115,2.86"/>
+        <dia:rectangle val="26.065,-1.05;33.875,3.41"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="50.415,2.01"/>
-        <dia:point val="46.12,2.01"/>
-        <dia:point val="46.12,-0.3"/>
-        <dia:point val="41.825,-0.3"/>
+        <dia:point val="26.115,2.56"/>
+        <dia:point val="29.82,2.56"/>
+        <dia:point val="29.82,-0.3"/>
+        <dia:point val="33.525,-0.3"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -3299,8 +3253,8 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O8" connection="14"/>
-        <dia:connection handle="1" to="O6" connection="4"/>
+        <dia:connection handle="0" to="O8" connection="15"/>
+        <dia:connection handle="1" to="O6" connection="3"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O16">
@@ -3482,7 +3436,7 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O38" connection="8"/>
+        <dia:connection handle="0" to="O33" connection="8"/>
         <dia:connection handle="1" to="O5" connection="3"/>
       </dia:connections>
     </dia:object>
@@ -3682,22 +3636,22 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.5008,-2.49249"/>
+        <dia:point val="20.8508,11.3575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.4508,-2.54249;28.4508,1.55751"/>
+        <dia:rectangle val="20.8008,11.3075;31.9508,19.4075"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="13.5008,-2.49249"/>
+        <dia:point val="20.8508,11.3575"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="14.9"/>
+        <dia:real val="11.049999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="4"/>
+        <dia:real val="8"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#Telefono#</dia:string>
+        <dia:string>#Direccion#</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -3800,30 +3754,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#tipo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#enum(particular, laboral, celular)#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Tipo de telefono.#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#numero#</dia:string>
+            <dia:string>#calle#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#string#</dia:string>
@@ -3832,7 +3763,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Numero de telefono#</dia:string>
+            <dia:string>#Calle del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -3844,143 +3775,18 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-      </dia:attribute>
-      <dia:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O21">
-      <dia:attribute name="obj_pos">
-        <dia:point val="20.8508,11.3575"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.8008,11.3075;31.9508,18.6075"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="20.8508,11.3575"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="11.049999999999999"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="7.1999999999999993"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#Direccion#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="comment">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_attributes">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_attributes">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#id#</dia:string>
+            <dia:string>#numero#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
           </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>#PK#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#calle#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
-          </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Calle del domicilio#</dia:string>
+            <dia:string>#Número del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -3994,7 +3800,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#numero#</dia:string>
+            <dia:string>#piso#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
@@ -4003,7 +3809,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Número del domicilio#</dia:string>
+            <dia:string>#Piso del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -4017,16 +3823,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#piso#</dia:string>
+            <dia:string>#departamento#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Piso del domicilio#</dia:string>
+            <dia:string>#Departamento del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -4040,16 +3846,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#departamento#</dia:string>
+            <dia:string>#codigoPostal#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string#</dia:string>
+            <dia:string>#string(8)#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Departamento del domicilio#</dia:string>
+            <dia:string>#Código postal del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -4063,16 +3869,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#codigoPostal#</dia:string>
+            <dia:string>#provincia#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#string(8)#</dia:string>
+            <dia:string>#enum([provincias])#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Código postal del domicilio#</dia:string>
+            <dia:string>#Provincia donde se encuentra el domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -4086,16 +3892,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#provincia#</dia:string>
+            <dia:string>#telefono#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#enum([provincias])#</dia:string>
+            <dia:string>#string#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
-            <dia:string>#Provincia donde se encuentra el domicilio#</dia:string>
+            <dia:string>#Teléfono del domicilio#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -4114,20 +3920,22 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O22">
+    <dia:object type="UML - Association" version="0" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="30.996,7.53251"/>
+        <dia:point val="26.3758,19.3575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.946,6.78251;39.8,10.05"/>
+        <dia:rectangle val="26.3258,15.15;39.2,21.7575"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30.996,7.53251"/>
-        <dia:point val="35.223,7.53251"/>
-        <dia:point val="35.223,9.2"/>
-        <dia:point val="39.45,9.2"/>
+        <dia:point val="26.3758,19.3575"/>
+        <dia:point val="26.3758,20.3575"/>
+        <dia:point val="32.6129,20.3575"/>
+        <dia:point val="32.6129,15.9"/>
+        <dia:point val="38.85,15.9"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
@@ -4144,7 +3952,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4169,29 +3977,25 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O40" connection="11"/>
-        <dia:connection handle="1" to="O1" connection="3"/>
+        <dia:connection handle="0" to="O20" connection="6"/>
+        <dia:connection handle="1" to="O1" connection="26"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O23">
+    <dia:object type="UML - Association" version="0" id="O22">
       <dia:attribute name="obj_pos">
-        <dia:point val="26.3758,18.5575"/>
+        <dia:point val="5.65,4.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.3258,16.85;39.8,20.9575"/>
+        <dia:rectangle val="5.6,4.7;7.275,16.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="26.3758,18.5575"/>
-        <dia:point val="26.3758,19.5575"/>
-        <dia:point val="32.9129,19.5575"/>
-        <dia:point val="32.9129,17.6"/>
-        <dia:point val="39.45,17.6"/>
+        <dia:point val="5.65,4.75"/>
+        <dia:point val="5.65,15.75"/>
+        <dia:point val="6.925,15.75"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
         <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -4219,7 +4023,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4230,73 +4034,16 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O21" connection="6"/>
-        <dia:connection handle="1" to="O1" connection="26"/>
+        <dia:connection handle="0" to="O5" connection="6"/>
+        <dia:connection handle="1" to="O7" connection="26"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O24">
+    <dia:object type="UML - Association" version="0" id="O23">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.65,5.55"/>
+        <dia:point val="17.975,17.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.6,5.5;7.275,16.6"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="5.65,5.55"/>
-        <dia:point val="5.65,15.75"/>
-        <dia:point val="6.925,15.75"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O5" connection="6"/>
-        <dia:connection handle="1" to="O7" connection="26"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O25">
-      <dia:attribute name="obj_pos">
-        <dia:point val="17.975,17.35"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.925,16.6;21.95,24.6"/>
+        <dia:rectangle val="17.925,16.6;21.95,24.6"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="17.975,17.35"/>
@@ -4353,80 +4100,18 @@
         <dia:connection handle="1" to="O2" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O26">
-      <dia:attribute name="obj_pos">
-        <dia:point val="33.525,3.3"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.3508,-2.54249;33.875,4.15"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="33.525,3.3"/>
-        <dia:point val="30.9629,3.3"/>
-        <dia:point val="30.9629,-1.79249"/>
-        <dia:point val="28.4008,-1.79249"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O6" connection="14"/>
-        <dia:connection handle="1" to="O20" connection="4"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O27">
+    <dia:object type="UML - Association" version="0" id="O24">
       <dia:attribute name="obj_pos">
         <dia:point val="31.9008,12.0575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.8508,3.35;33.875,12.9075"/>
+        <dia:rectangle val="31.8508,2.55;33.875,12.9075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="31.9008,12.0575"/>
         <dia:point val="32.7129,12.0575"/>
-        <dia:point val="32.7129,4.1"/>
-        <dia:point val="33.525,4.1"/>
+        <dia:point val="32.7129,3.3"/>
+        <dia:point val="33.525,3.3"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4470,11 +4155,11 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O21" connection="4"/>
-        <dia:connection handle="1" to="O6" connection="16"/>
+        <dia:connection handle="0" to="O20" connection="4"/>
+        <dia:connection handle="1" to="O6" connection="14"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O28">
+    <dia:object type="UML - Association" version="0" id="O25">
       <dia:attribute name="obj_pos">
         <dia:point val="47.615,35.35"/>
       </dia:attribute>
@@ -4533,69 +4218,7 @@
         <dia:connection handle="1" to="O2" connection="15"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O29">
-      <dia:attribute name="obj_pos">
-        <dia:point val="13.5008,-1.79249"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,-2.54249;13.8508,5.1"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="13.5008,-1.79249"/>
-        <dia:point val="12.025,-1.79249"/>
-        <dia:point val="12.025,4.25"/>
-        <dia:point val="9.8,4.25"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O20" connection="3"/>
-        <dia:connection handle="1" to="O5" connection="17"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O30">
+    <dia:object type="UML - Association" version="0" id="O26">
       <dia:attribute name="obj_pos">
         <dia:point val="12.45,17.85"/>
       </dia:attribute>
@@ -4659,17 +4282,17 @@
         <dia:connection handle="1" to="O10" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O31">
+    <dia:object type="UML - Association" version="0" id="O27">
       <dia:attribute name="obj_pos">
-        <dia:point val="51.85,18.1"/>
+        <dia:point val="51.25,16.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="46.565,18.05;52.55,31.4"/>
+        <dia:rectangle val="46.565,16.35;51.95,31.4"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="51.85,18.1"/>
-        <dia:point val="51.85,19.1"/>
-        <dia:point val="46.615,19.1"/>
+        <dia:point val="51.25,16.4"/>
+        <dia:point val="51.25,17.4"/>
+        <dia:point val="46.615,17.4"/>
         <dia:point val="46.615,30.55"/>
         <dia:point val="47.615,30.55"/>
       </dia:attribute>
@@ -4720,17 +4343,17 @@
         <dia:connection handle="1" to="O9" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O32">
+    <dia:object type="UML - Association" version="0" id="O28">
       <dia:attribute name="obj_pos">
-        <dia:point val="39.45,16.8"/>
+        <dia:point val="38.85,15.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.625,4.55;39.8,17.65"/>
+        <dia:rectangle val="37.625,3.75;39.2,15.95"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="39.45,16.8"/>
-        <dia:point val="37.675,16.8"/>
-        <dia:point val="37.675,4.6"/>
+        <dia:point val="38.85,15.1"/>
+        <dia:point val="37.675,15.1"/>
+        <dia:point val="37.675,3.8"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4777,17 +4400,17 @@
         <dia:connection handle="1" to="O6" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O33">
+    <dia:object type="UML - Association" version="0" id="O29">
       <dia:attribute name="obj_pos">
         <dia:point val="30.25,24.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="30.2,18.05;46.35,25.8"/>
+        <dia:rectangle val="30.2,16.35;45.75,25.8"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="30.25,24.95"/>
-        <dia:point val="45.65,24.95"/>
-        <dia:point val="45.65,18.1"/>
+        <dia:point val="45.05,24.95"/>
+        <dia:point val="45.05,16.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -4834,7 +4457,7 @@
         <dia:connection handle="1" to="O1" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O34">
+    <dia:object type="UML - Association" version="0" id="O30">
       <dia:attribute name="obj_pos">
         <dia:point val="20.915,36.5825"/>
       </dia:attribute>
@@ -4891,7 +4514,7 @@
         <dia:connection handle="1" to="O4" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O35">
+    <dia:object type="UML - Association" version="0" id="O31">
       <dia:attribute name="obj_pos">
         <dia:point val="-4.925,17.95"/>
       </dia:attribute>
@@ -4950,18 +4573,18 @@
         <dia:connection handle="1" to="O12" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O36">
+    <dia:object type="UML - Association" version="0" id="O32">
       <dia:attribute name="obj_pos">
         <dia:point val="20.8508,12.0575"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,4.3;21.2008,12.9075"/>
+        <dia:rectangle val="9.75,3.5;21.2008,12.9075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.8508,12.0575"/>
         <dia:point val="20.175,12.0575"/>
-        <dia:point val="20.175,5.05"/>
-        <dia:point val="9.8,5.05"/>
+        <dia:point val="20.175,4.25"/>
+        <dia:point val="9.8,4.25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -5008,75 +4631,11 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O21" connection="3"/>
-        <dia:connection handle="1" to="O5" connection="19"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O37">
-      <dia:attribute name="obj_pos">
-        <dia:point val="54.215,-2.29"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.75,-3.34;54.915,0.7"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="54.215,-2.29"/>
-        <dia:point val="54.215,-3.29"/>
-        <dia:point val="11.075,-3.29"/>
-        <dia:point val="11.075,-0.15"/>
-        <dia:point val="9.8,-0.15"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O8" connection="1"/>
-        <dia:connection handle="1" to="O5" connection="4"/>
+        <dia:connection handle="0" to="O20" connection="3"/>
+        <dia:connection handle="1" to="O5" connection="17"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O38">
+    <dia:object type="UML - Class" version="0" id="O33">
       <dia:attribute name="obj_pos">
         <dia:point val="-5.075,7.88251"/>
       </dia:attribute>
@@ -5224,12 +4783,12 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O39">
+    <dia:object type="UML - Association" version="0" id="O34">
       <dia:attribute name="obj_pos">
         <dia:point val="-5.075,10.5825"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.125,9.83251;4.425,16"/>
+        <dia:rectangle val="-6.125,9.8325;4.425,16"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.075,10.5825"/>
@@ -5283,225 +4842,20 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O38" connection="10"/>
+        <dia:connection handle="0" to="O33" connection="10"/>
         <dia:connection handle="1" to="O3" connection="4"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O40">
-      <dia:attribute name="obj_pos">
-        <dia:point val="21.996,4.83251"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.946,4.78251;31.046,8.08251"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="21.996,4.83251"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="9"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#TelefonoPersona#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="comment">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_attributes">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_attributes">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="attributes">
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#idTelefono#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>#PK/FK#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#idPersona#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>#PK/FK#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O41">
-      <dia:attribute name="obj_pos">
-        <dia:point val="20.9508,1.50751"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.9008,1.45751;22.346,7.58251"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="20.9508,1.50751"/>
-        <dia:point val="20.9508,6.73251"/>
-        <dia:point val="21.996,6.73251"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#*#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O20" connection="6"/>
-        <dia:connection handle="1" to="O40" connection="8"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O42">
+    <dia:object type="UML - Association" version="0" id="O35">
       <dia:attribute name="obj_pos">
-        <dia:point val="51.85,9.2"/>
+        <dia:point val="51.25,7.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="47.8651,8.45;58.7651,27.45"/>
+        <dia:rectangle val="47.8651,6.75;58.7651,27.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="51.85,9.2"/>
-        <dia:point val="58.7151,9.2"/>
+        <dia:point val="51.25,7.5"/>
+        <dia:point val="58.7151,7.5"/>
         <dia:point val="58.7151,21.2575"/>
         <dia:point val="47.9151,21.2575"/>
         <dia:point val="47.9151,26.6"/>
@@ -5558,7 +4912,7 @@
         <dia:connection handle="1" to="O0" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O43">
+    <dia:object type="UML - Association" version="0" id="O36">
       <dia:attribute name="obj_pos">
         <dia:point val="56.265,34.55"/>
       </dia:attribute>
@@ -5617,7 +4971,7 @@
         <dia:connection handle="1" to="O0" connection="4"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O44">
+    <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">
         <dia:point val="21.6,30.55"/>
       </dia:attribute>
@@ -5681,7 +5035,7 @@
         <dia:connection handle="1" to="O2" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="0" id="O45">
+    <dia:object type="UML - Association" version="0" id="O38">
       <dia:attribute name="obj_pos">
         <dia:point val="30.25,31.05"/>
       </dia:attribute>
@@ -5740,5 +5094,64 @@
         <dia:connection handle="1" to="O19" connection="9"/>
       </dia:connections>
     </dia:object>
+    <dia:object type="UML - Association" version="0" id="O39">
+      <dia:attribute name="obj_pos">
+        <dia:point val="9.8,3.45"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="9.75,-1.79;18.865,4.3"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="9.8,3.45"/>
+        <dia:point val="14.1575,3.45"/>
+        <dia:point val="14.1575,-1.04"/>
+        <dia:point val="18.515,-1.04"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O5" connection="15"/>
+        <dia:connection handle="1" to="O8" connection="3"/>
+      </dia:connections>
+    </dia:object>
   </dia:layer>
 </dia:diagram>