Completed first draft diagrams at doc/diagrams.xmi. Added templates for SRS and USR documents -> Next week I'll work on them

3 files changed, 221 insertions, 49 deletions

diff --git a/doc/SRS_v0.1.odt b/doc/SRS_v0.1.odt
new file mode 100644
index 00000000..d7f99d39
--- /dev/null
+++ b/doc/SRS_v0.1.odt
diff --git a/doc/URS v0.1.odt b/doc/URS v0.1.odt
new file mode 100644
index 00000000..e72197e8
--- /dev/null
+++ b/doc/URS v0.1.odt
diff --git a/doc/diagrams.xmi b/doc/diagrams.xmi
index 38182c35..75a0e5f1 100644
--- a/doc/diagrams.xmi
+++ b/doc/diagrams.xmi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMI verified="false" xmi.version="1.2" timestamp="2013-02-13T21:09:05" xmlns:UML="http://schema.omg.org/spec/UML/1.3">
+<XMI verified="false" xmi.version="1.2" timestamp="2013-02-14T20:32:40" xmlns:UML="http://schema.omg.org/spec/UML/1.3">
  <XMI.header>
   <XMI.documentation>
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
@@ -33,13 +33,164 @@
         <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Ojyz8ATj0cjL" name="String"/>
        </UML:Namespace.ownedElement>
       </UML:Package>
+      <UML:Package visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="PqejKem6nMps" name="GUI">
+       <UML:Namespace.ownedElement/>
+      </UML:Package>
+      <UML:Package visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="WmXThANmPyRt" name="Client">
+       <UML:Namespace.ownedElement/>
+      </UML:Package>
+      <UML:Package visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="ob9SZixyZcfr" name="Service">
+       <UML:Namespace.ownedElement/>
+      </UML:Package>
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="ESv0mjqGVLkA" name="Dashboard"/>
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="V7uu3MosxvKW" name="ConfigurationWizard"/>
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="KSSNKQHTLQJ8" name="ConfigHelper"/>
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Kcc1wpGniLKf" name="LeapHttpClient"/>
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="S2RGyWoIwEdH" name="NewProviderDialog"/>
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="euixKz5cbibV" name="Provider"/>
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="XsGDBbqdbHsX" name="ProviderAPI"/>
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="oepktQzVIfTa" name="ProviderAPIResultReceiver"/>
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="eYCDEoikexxp" name="ProviderListContent"/>
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="YmR91JgpxTYo" name="ProviderListFragment"/>
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="tVK99njlJvzY" name="">
+       <UML:Association.connection>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="hfILcDB8zcH1" type="ESv0mjqGVLkA" name="" aggregation="none"/>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="tvooMKdDoxMx" type="V7uu3MosxvKW" name="" aggregation="none"/>
+       </UML:Association.connection>
+      </UML:Association>
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="i5i1zfXgLp2v" name="">
+       <UML:Association.connection>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="3B40lJzeFoSZ" type="ESv0mjqGVLkA" name="" aggregation="none"/>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="65nu07piBYiA" type="euixKz5cbibV" name="" aggregation="none"/>
+       </UML:Association.connection>
+      </UML:Association>
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="BFqU5qQ61U4m" name="">
+       <UML:Association.connection>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="l4O0srYyuJrv" type="V7uu3MosxvKW" name="" aggregation="none"/>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="QgbZCJjOXYsc" type="XsGDBbqdbHsX" name="" aggregation="none"/>
+       </UML:Association.connection>
+      </UML:Association>
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="OGgOik8UoXSe" name="">
+       <UML:Association.connection>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="O0bIHSBg6nFJ" type="V7uu3MosxvKW" name="" aggregation="none"/>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="4zfbVVBtmpHU" type="eYCDEoikexxp" name="" aggregation="none"/>
+       </UML:Association.connection>
+      </UML:Association>
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="aQwMvPzJNaZf" name="">
+       <UML:Association.connection>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="0jL6WaNYX2A2" type="V7uu3MosxvKW" name="" aggregation="none"/>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="WJuI99khXh1S" type="KSSNKQHTLQJ8" name="" aggregation="none"/>
+       </UML:Association.connection>
+      </UML:Association>
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="60jTYJ6Y0RdU" name="">
+       <UML:Association.connection>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="002X1AYXUSnb" type="XsGDBbqdbHsX" name="" aggregation="none"/>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="bVI9CJZGKJiq" type="Kcc1wpGniLKf" name="" aggregation="none"/>
+       </UML:Association.connection>
+      </UML:Association>
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="aoPaE04Ey4jx" name="">
+       <UML:Association.connection>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="FHShhFGJlYQv" type="V7uu3MosxvKW" name="" aggregation="none"/>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="pzA7GsyqeLOs" type="oepktQzVIfTa" name="" aggregation="none"/>
+       </UML:Association.connection>
+      </UML:Association>
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="LQ4JVoHi3jNl" name="">
+       <UML:Association.connection>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="xd4gBSbyPj6g" type="V7uu3MosxvKW" name="" aggregation="none"/>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="b4UENt6iH9zm" type="S2RGyWoIwEdH" name="" aggregation="none"/>
+       </UML:Association.connection>
+      </UML:Association>
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="ES0ypltSnXbD" name="">
+       <UML:Association.connection>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="6YdqeHRglf3c" type="V7uu3MosxvKW" name="" aggregation="none"/>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="kjuriemx7mtu" type="YmR91JgpxTYo" name="" aggregation="none"/>
+       </UML:Association.connection>
+      </UML:Association>
      </UML:Namespace.ownedElement>
+     <XMI.extension xmi.extender="umbrello">
+      <diagrams>
+       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" textcolor="#000000" isopen="1" showpackage="1" showpubliconly="0" showstereotype="1" name="leap_android main class diagram" font="Sans Serif,9,-1,0,50,0,0,0,0,0" canvasheight="913" canvaswidth="1601" localid="-1" snapcsgrid="0" showgrid="0" showops="1" griddotcolor="#808080" backgroundcolor="#ffffff" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="5FchWsAGezbV" documentation="" showscope="1" snapgrid="0" showatts="1" type="1">
+        <widgets>
+         <packagewidget width="302" showstereotype="1" x="1012" usesdiagramusefillcolor="0" y="34" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="218" linecolor="none" xmi.id="PqejKem6nMps" textcolor="#000000" usefillcolor="0" linewidth="none" font="Sans Serif,9,-1,0,75,0,0,0,0,0"/>
+         <packagewidget width="317" showstereotype="1" x="1006" usesdiagramusefillcolor="0" y="278" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="177" linecolor="none" xmi.id="WmXThANmPyRt" textcolor="#000000" usefillcolor="0" linewidth="none" font="Sans Serif,9,-1,0,75,0,0,0,0,0"/>
+         <packagewidget width="308" showstereotype="1" x="1008" usesdiagramusefillcolor="0" y="483" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="68" linecolor="none" xmi.id="ob9SZixyZcfr" textcolor="#000000" usefillcolor="0" linewidth="none" font="Sans Serif,9,-1,0,75,0,0,0,0,0"/>
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" textcolor="#000000" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="210" showattsigs="601" showstereotype="1" y="172" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="80" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="ESv0mjqGVLkA" showscope="1" height="32" showopsigs="601"/>
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" textcolor="#000000" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="343" showattsigs="601" showstereotype="1" y="175" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="142" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="V7uu3MosxvKW" showscope="1" height="32" showopsigs="601"/>
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" textcolor="#000000" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="1" x="668" showattsigs="601" showstereotype="1" y="335" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="94" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="KSSNKQHTLQJ8" showscope="1" height="32" showopsigs="601"/>
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" textcolor="#000000" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="1" x="443" showattsigs="601" showstereotype="1" y="509" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="108" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="Kcc1wpGniLKf" showscope="1" height="32" showopsigs="601"/>
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" textcolor="#000000" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="1" x="615" showattsigs="601" showstereotype="1" y="89" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="134" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="S2RGyWoIwEdH" showscope="1" height="32" showopsigs="601"/>
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" textcolor="#000000" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="1" x="231" showattsigs="601" showstereotype="1" y="342" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="65" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="euixKz5cbibV" showscope="1" height="32" showopsigs="601"/>
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" textcolor="#000000" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="1" x="552" showattsigs="601" showstereotype="1" y="339" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="86" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="XsGDBbqdbHsX" showscope="1" height="32" showopsigs="601"/>
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" textcolor="#000000" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="1" x="773" showattsigs="601" showstereotype="1" y="91" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="182" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="oepktQzVIfTa" showscope="1" height="32" showopsigs="601"/>
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" textcolor="#000000" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="1" x="569" showattsigs="601" showstereotype="1" y="175" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="140" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="eYCDEoikexxp" showscope="1" height="32" showopsigs="601"/>
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" textcolor="#000000" usesdiagramusefillcolor="1" showpubliconly="0" showpackage="1" x="446" showattsigs="601" showstereotype="1" y="90" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="151" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="YmR91JgpxTYo" showscope="1" height="32" showopsigs="601"/>
+        </widgets>
+        <messages/>
+        <associations>
+         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="72" widgetaid="ESv0mjqGVLkA" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="2" xmi.id="tVK99njlJvzY" widgetbid="V7uu3MosxvKW" totalcountb="2" type="512" textcolor="none" usefillcolor="0" linewidth="none">
+          <linepath>
+           <startpoint startx="290" starty="175"/>
+           <endpoint endx="343" endy="175"/>
+          </linepath>
+         </assocwidget>
+         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="72" widgetaid="ESv0mjqGVLkA" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="2" xmi.id="i5i1zfXgLp2v" widgetbid="euixKz5cbibV" totalcountb="2" type="512" textcolor="none" usefillcolor="0" linewidth="none">
+          <linepath>
+           <startpoint startx="290" starty="204"/>
+           <endpoint endx="290" endy="342"/>
+          </linepath>
+         </assocwidget>
+         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="144" widgetaid="V7uu3MosxvKW" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="3" xmi.id="BFqU5qQ61U4m" widgetbid="XsGDBbqdbHsX" totalcountb="2" type="512" textcolor="none" usefillcolor="0" linewidth="none">
+          <linepath>
+           <startpoint startx="485" starty="207"/>
+           <endpoint endx="552" endy="339"/>
+          </linepath>
+         </assocwidget>
+         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="52" widgetaid="V7uu3MosxvKW" usesdiagramfillcolor="120" fillcolor="none" linecolor="none" totalcounta="3" xmi.id="OGgOik8UoXSe" widgetbid="eYCDEoikexxp" totalcountb="2" type="512" textcolor="none" usefillcolor="120" linewidth="none">
+          <linepath>
+           <startpoint startx="485" starty="175"/>
+           <endpoint endx="569" endy="175"/>
+          </linepath>
+         </assocwidget>
+         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="32" widgetaid="V7uu3MosxvKW" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="3" xmi.id="aQwMvPzJNaZf" widgetbid="KSSNKQHTLQJ8" totalcountb="2" type="512" textcolor="none" usefillcolor="2" linewidth="none">
+          <linepath>
+           <startpoint startx="485" starty="207"/>
+           <endpoint endx="668" endy="335"/>
+          </linepath>
+         </assocwidget>
+         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="16" widgetaid="XsGDBbqdbHsX" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="2" xmi.id="60jTYJ6Y0RdU" widgetbid="Kcc1wpGniLKf" totalcountb="2" type="512" textcolor="none" usefillcolor="2" linewidth="none">
+          <linepath>
+           <startpoint startx="552" starty="371"/>
+           <endpoint endx="551" endy="509"/>
+          </linepath>
+         </assocwidget>
+         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="48" widgetaid="V7uu3MosxvKW" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="3" xmi.id="aoPaE04Ey4jx" widgetbid="oepktQzVIfTa" totalcountb="2" type="512" textcolor="none" usefillcolor="2" linewidth="none">
+          <linepath>
+           <startpoint startx="485" starty="175"/>
+           <endpoint endx="773" endy="123"/>
+          </linepath>
+         </assocwidget>
+         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="123" widgetaid="V7uu3MosxvKW" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="3" xmi.id="LQ4JVoHi3jNl" widgetbid="S2RGyWoIwEdH" totalcountb="2" type="512" textcolor="none" usefillcolor="107" linewidth="none">
+          <linepath>
+           <startpoint startx="485" starty="175"/>
+           <endpoint endx="615" endy="121"/>
+          </linepath>
+         </assocwidget>
+         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="176" widgetaid="V7uu3MosxvKW" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="3" xmi.id="ES0ypltSnXbD" widgetbid="YmR91JgpxTYo" totalcountb="2" type="512" textcolor="none" usefillcolor="2" linewidth="none">
+          <linepath>
+           <startpoint startx="446" starty="175"/>
+           <endpoint endx="446" endy="122"/>
+          </linepath>
+         </assocwidget>
+        </associations>
+       </diagram>
+      </diagrams>
+     </XMI.extension>
     </UML:Model>
     <UML:Model stereotype="folder" visibility="public" isSpecification="false" namespace="m1" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Use Case View" name="Use Case View">
      <UML:Namespace.ownedElement>
       <UML:UseCase visibility="public" isSpecification="false" namespace="Use Case View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="z5yBRg9RoHuW" name="OpenVPN connection stablishment"/>
       <UML:Actor visibility="public" isSpecification="false" namespace="Use Case View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="zUJuSHmTSoxz" name="User"/>
-      <UML:UseCase visibility="public" isSpecification="false" namespace="Use Case View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="dxwht76XFXMU" name="Select VPN providers on the first time"/>
+      <UML:UseCase visibility="public" isSpecification="false" namespace="Use Case View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="dxwht76XFXMU" name="Select from LEAP-trusted VPN providers on the first time"/>
       <UML:UseCase visibility="public" isSpecification="false" namespace="Use Case View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Psks5Jf2nwuD" name="Add custom OpenVPN provider"/>
       <UML:UseCase visibility="public" isSpecification="false" namespace="Use Case View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="3RxIQYQw0RPY" name="OpenVPN connection"/>
       <UML:Association visibility="public" isSpecification="false" namespace="Use Case View" xmi.id="v9IEJB10DZ62" name="">
@@ -206,11 +357,10 @@
         <widgets>
          <usecasewidget width="232" showstereotype="1" x="669" usesdiagramusefillcolor="1" y="1173" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="48" linecolor="none" xmi.id="z5yBRg9RoHuW" textcolor="#000000" usefillcolor="1" linewidth="none" font="Sans Serif,9,-1,0,50,0,0,0,0,0"/>
          <actorwidget width="36" showstereotype="1" x="53" usesdiagramusefillcolor="1" y="824" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="58" linecolor="none" xmi.id="zUJuSHmTSoxz" textcolor="#000000" usefillcolor="1" linewidth="none" font="Sans Serif,9,-1,0,50,0,0,0,0,0"/>
-         <usecasewidget width="253" showstereotype="1" x="658" usesdiagramusefillcolor="1" y="1257" usesdiagramfillcolor="0" isinstance="0" fillcolor="#c0ffc0" height="48" linecolor="none" xmi.id="dxwht76XFXMU" textcolor="#000000" usefillcolor="1" linewidth="none" font="Sans Serif,9,-1,0,50,0,0,0,0,0"/>
+         <usecasewidget width="375" showstereotype="1" x="664" usesdiagramusefillcolor="1" y="1258" usesdiagramfillcolor="0" isinstance="0" fillcolor="#c0ffc0" height="48" linecolor="none" xmi.id="dxwht76XFXMU" textcolor="#000000" usefillcolor="1" linewidth="none" font="Sans Serif,9,-1,0,50,0,0,0,0,0"/>
          <usecasewidget width="230" showstereotype="1" x="682" usesdiagramusefillcolor="1" y="1341" usesdiagramfillcolor="0" isinstance="0" fillcolor="#c0ffc0" height="48" linecolor="none" xmi.id="Psks5Jf2nwuD" textcolor="#000000" usefillcolor="1" linewidth="none" font="Sans Serif,9,-1,0,50,0,0,0,0,0"/>
          <usecasewidget width="145" showstereotype="1" x="318" usesdiagramusefillcolor="1" y="1324" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="48" linecolor="none" xmi.id="3RxIQYQw0RPY" textcolor="#000000" usefillcolor="1" linewidth="none" font="Sans Serif,9,-1,0,50,0,0,0,0,0"/>
          <usecasewidget width="181" showstereotype="1" x="301" usesdiagramusefillcolor="1" y="331" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="48" linecolor="none" xmi.id="R4Iv8xsMQ45u" textcolor="#000000" usefillcolor="1" linewidth="none" font="Sans Serif,9,-1,0,50,0,0,0,0,0"/>
-         <boxwidget width="100" showstereotype="1" x="743" usesdiagramusefillcolor="1" y="23" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="80" linecolor="#000000" xmi.id="eJYfHqBisRb0" textcolor="#000000" usefillcolor="1" linewidth="none" font="Sans Serif,9,-1,0,50,0,0,0,0,0"/>
          <usecasewidget width="80" showstereotype="1" x="750" usesdiagramusefillcolor="1" y="333" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="48" linecolor="none" xmi.id="MlWSfKugQadE" textcolor="#000000" usefillcolor="1" linewidth="none" font="Sans Serif,9,-1,0,50,0,0,0,0,0"/>
          <usecasewidget width="100" showstereotype="1" x="740" usesdiagramusefillcolor="1" y="417" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="48" linecolor="none" xmi.id="iQhwsLFO0UEB" textcolor="#000000" usefillcolor="1" linewidth="none" font="Sans Serif,9,-1,0,50,0,0,0,0,0"/>
          <usecasewidget width="148" showstereotype="1" x="314" usesdiagramusefillcolor="1" y="693" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="48" linecolor="none" xmi.id="C7bm7xDSihsM" textcolor="#000000" usefillcolor="1" linewidth="none" font="Sans Serif,9,-1,0,50,0,0,0,0,0"/>
@@ -235,139 +385,139 @@
         </widgets>
         <messages/>
         <associations>
-         <assocwidget indexa="4" indexb="1" usesdiagramusefillcolor="168" widgetaid="zUJuSHmTSoxz" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="5" xmi.id="v9IEJB10DZ62" widgetbid="3RxIQYQw0RPY" totalcountb="3" type="503" textcolor="none" usefillcolor="0" linewidth="none">
+         <assocwidget indexa="4" indexb="1" usesdiagramusefillcolor="1" widgetaid="zUJuSHmTSoxz" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="5" xmi.id="v9IEJB10DZ62" widgetbid="3RxIQYQw0RPY" totalcountb="3" type="503" textcolor="none" usefillcolor="0" linewidth="none">
           <linepath>
            <startpoint startx="89" starty="882"/>
            <endpoint endx="318" endy="1324"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="0" widgetaid="3RxIQYQw0RPY" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="3" xmi.id="zTmC2rConfey" widgetbid="z5yBRg9RoHuW" totalcountb="2" type="512" textcolor="none" usefillcolor="2" linewidth="none">
+         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="0" widgetaid="3RxIQYQw0RPY" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="3" xmi.id="zTmC2rConfey" widgetbid="z5yBRg9RoHuW" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="463" starty="1324"/>
            <endpoint endx="669" endy="1221"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="192" widgetaid="3RxIQYQw0RPY" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="fYvSBaQ3ncXZ" widgetbid="dxwht76XFXMU" totalcountb="2" type="512" textcolor="none" usefillcolor="2" linewidth="none">
+         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="1" widgetaid="3RxIQYQw0RPY" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="fYvSBaQ3ncXZ" widgetbid="dxwht76XFXMU" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="463" starty="1324"/>
-           <endpoint endx="658" endy="1305"/>
+           <endpoint endx="664" endy="1306"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="48" widgetaid="3RxIQYQw0RPY" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="RuxEUTlnU6gy" widgetbid="Psks5Jf2nwuD" totalcountb="2" type="512" textcolor="none" usefillcolor="2" linewidth="none">
+         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="1" widgetaid="3RxIQYQw0RPY" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="RuxEUTlnU6gy" widgetbid="Psks5Jf2nwuD" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="463" starty="1372"/>
            <endpoint endx="682" endy="1372"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="3" indexb="1" usesdiagramusefillcolor="111" widgetaid="3RxIQYQw0RPY" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="gbImgmgDOhkn" widgetbid="wXe1ZPXO1cZC" totalcountb="2" type="512" textcolor="none" usefillcolor="203" linewidth="none">
+         <assocwidget indexa="3" indexb="1" usesdiagramusefillcolor="1" widgetaid="3RxIQYQw0RPY" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="gbImgmgDOhkn" widgetbid="wXe1ZPXO1cZC" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="463" starty="1372"/>
            <endpoint endx="696" endy="1425"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="107" widgetaid="3RxIQYQw0RPY" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="2" xmi.id="JHyhxjSApGvV" widgetbid="L398YbtOWKZK" totalcountb="2" type="512" textcolor="none" usefillcolor="203" linewidth="none">
+         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="1" widgetaid="3RxIQYQw0RPY" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="2" xmi.id="JHyhxjSApGvV" widgetbid="L398YbtOWKZK" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="463" starty="1372"/>
            <endpoint endx="696" endy="1509"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="32" widgetaid="R4Iv8xsMQ45u" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="3" xmi.id="OwzBBvhPxsjD" widgetbid="yV2zoyqSA54n" totalcountb="2" type="512" textcolor="none" usefillcolor="2" linewidth="none">
+         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="1" widgetaid="R4Iv8xsMQ45u" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="3" xmi.id="OwzBBvhPxsjD" widgetbid="yV2zoyqSA54n" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="482" starty="379"/>
            <endpoint endx="750" endy="501"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="192" widgetaid="R4Iv8xsMQ45u" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="lFdj7KuO6Rj5" widgetbid="MlWSfKugQadE" totalcountb="2" type="512" textcolor="none" usefillcolor="2" linewidth="none">
+         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="1" widgetaid="R4Iv8xsMQ45u" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="lFdj7KuO6Rj5" widgetbid="MlWSfKugQadE" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="482" starty="333"/>
            <endpoint endx="750" endy="333"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="0" widgetaid="R4Iv8xsMQ45u" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="xCh2bO7NfzRU" widgetbid="qvTBoV9JX67V" totalcountb="2" type="512" textcolor="none" usefillcolor="2" linewidth="none">
+         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="0" widgetaid="R4Iv8xsMQ45u" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="xCh2bO7NfzRU" widgetbid="qvTBoV9JX67V" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="482" starty="331"/>
            <endpoint endx="668" endy="297"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="3" indexb="1" usesdiagramusefillcolor="224" widgetaid="R4Iv8xsMQ45u" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="D8Hs5hLc2n3y" widgetbid="iQhwsLFO0UEB" totalcountb="2" type="512" textcolor="none" usefillcolor="2" linewidth="none">
+         <assocwidget indexa="3" indexb="1" usesdiagramusefillcolor="1" widgetaid="R4Iv8xsMQ45u" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="D8Hs5hLc2n3y" widgetbid="iQhwsLFO0UEB" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="482" starty="379"/>
            <endpoint endx="740" endy="417"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="3" indexb="1" usesdiagramusefillcolor="240" widgetaid="C7bm7xDSihsM" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="WFq85mxumf2j" widgetbid="1m2PMde21Jyt" totalcountb="2" type="512" textcolor="none" usefillcolor="2" linewidth="none">
+         <assocwidget indexa="3" indexb="1" usesdiagramusefillcolor="1" widgetaid="C7bm7xDSihsM" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="WFq85mxumf2j" widgetbid="1m2PMde21Jyt" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="462" starty="741"/>
            <endpoint endx="730" endy="753"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="128" widgetaid="C7bm7xDSihsM" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="ITK49NlFwWhO" widgetbid="eCHceTopYNbe" totalcountb="2" type="512" textcolor="none" usefillcolor="78" linewidth="none">
+         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="1" widgetaid="C7bm7xDSihsM" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="ITK49NlFwWhO" widgetbid="eCHceTopYNbe" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="462" starty="693"/>
            <endpoint endx="686" endy="633"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="64" widgetaid="C7bm7xDSihsM" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="s6UmaB8IN911" widgetbid="Km61UyNTiNt2" totalcountb="2" type="512" textcolor="none" usefillcolor="2" linewidth="none">
+         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="1" widgetaid="C7bm7xDSihsM" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="4" xmi.id="s6UmaB8IN911" widgetbid="Km61UyNTiNt2" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="462" starty="717"/>
            <endpoint endx="734" endy="717"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="165" widgetaid="R4Iv8xsMQ45u" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="2" xmi.id="5xgQ6gPbpD0F" widgetbid="qc5BDjWzpVRl" totalcountb="2" type="512" textcolor="none" usefillcolor="86" linewidth="none">
+         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="1" widgetaid="R4Iv8xsMQ45u" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="2" xmi.id="5xgQ6gPbpD0F" widgetbid="qc5BDjWzpVRl" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="482" starty="331"/>
            <endpoint endx="668" endy="213"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="116" widgetaid="zUJuSHmTSoxz" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="5" xmi.id="guyT7zhuBjqk" widgetbid="R4Iv8xsMQ45u" totalcountb="3" type="503" textcolor="none" usefillcolor="190" linewidth="none">
+         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="1" widgetaid="zUJuSHmTSoxz" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="5" xmi.id="guyT7zhuBjqk" widgetbid="R4Iv8xsMQ45u" totalcountb="3" type="503" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="89" starty="824"/>
            <endpoint endx="301" endy="379"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="80" widgetaid="zUJuSHmTSoxz" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="5" xmi.id="eUtpDkZUau5s" widgetbid="C7bm7xDSihsM" totalcountb="2" type="503" textcolor="none" usefillcolor="125" linewidth="none">
+         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="1" widgetaid="zUJuSHmTSoxz" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="5" xmi.id="eUtpDkZUau5s" widgetbid="C7bm7xDSihsM" totalcountb="2" type="503" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="89" starty="824"/>
            <endpoint endx="314" endy="741"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="173" widgetaid="fVEFNH5ORKhF" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="5" xmi.id="pJxrLdHcK3JN" widgetbid="xO3GXCEj0VnU" totalcountb="2" type="512" textcolor="none" usefillcolor="32" linewidth="none">
+         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="1" widgetaid="fVEFNH5ORKhF" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="5" xmi.id="pJxrLdHcK3JN" widgetbid="xO3GXCEj0VnU" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="455" starty="969"/>
            <endpoint endx="693" endy="969"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="3" indexb="1" usesdiagramusefillcolor="107" widgetaid="fVEFNH5ORKhF" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="5" xmi.id="VU5nVOA2eXOu" widgetbid="Yqd4nZoS22fQ" totalcountb="2" type="512" textcolor="none" usefillcolor="138" linewidth="none">
+         <assocwidget indexa="3" indexb="1" usesdiagramusefillcolor="1" widgetaid="fVEFNH5ORKhF" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="5" xmi.id="VU5nVOA2eXOu" widgetbid="Yqd4nZoS22fQ" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="455" starty="1013"/>
            <endpoint endx="695" endy="1013"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="4" indexb="1" usesdiagramusefillcolor="202" widgetaid="fVEFNH5ORKhF" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="5" xmi.id="DGHqldisi3xc" widgetbid="Jjoj3Vy1r0FP" totalcountb="2" type="512" textcolor="none" usefillcolor="99" linewidth="none">
+         <assocwidget indexa="4" indexb="1" usesdiagramusefillcolor="1" widgetaid="fVEFNH5ORKhF" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="5" xmi.id="DGHqldisi3xc" widgetbid="Jjoj3Vy1r0FP" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="455" starty="1015"/>
            <endpoint endx="719" endy="1089"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="96" widgetaid="fVEFNH5ORKhF" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="5" xmi.id="45Gm6BM46YDL" widgetbid="AR6AutfSjIXX" totalcountb="2" type="512" textcolor="none" usefillcolor="2" linewidth="none">
+         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="1" widgetaid="fVEFNH5ORKhF" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="5" xmi.id="45Gm6BM46YDL" widgetbid="AR6AutfSjIXX" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="455" starty="967"/>
            <endpoint endx="665" endy="885"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="3" indexb="1" usesdiagramusefillcolor="192" widgetaid="zUJuSHmTSoxz" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="5" xmi.id="56LAdWTNbCId" widgetbid="fVEFNH5ORKhF" totalcountb="2" type="503" textcolor="none" usefillcolor="2" linewidth="none">
+         <assocwidget indexa="3" indexb="1" usesdiagramusefillcolor="1" widgetaid="zUJuSHmTSoxz" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="5" xmi.id="56LAdWTNbCId" widgetbid="fVEFNH5ORKhF" totalcountb="2" type="503" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="89" starty="882"/>
            <endpoint endx="326" endy="967"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="0" widgetaid="yV2zoyqSA54n" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="3" xmi.id="qmQ6BZx79Dcv" widgetbid="vcGXmYAOm2uB" totalcountb="2" type="512" textcolor="none" usefillcolor="212" linewidth="none">
+         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="0" widgetaid="yV2zoyqSA54n" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="3" xmi.id="qmQ6BZx79Dcv" widgetbid="vcGXmYAOm2uB" totalcountb="2" type="512" textcolor="none" usefillcolor="1" linewidth="none">
           <linepath>
            <startpoint startx="831" starty="501"/>
            <endpoint endx="881" endy="501"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="32" widgetaid="yV2zoyqSA54n" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="3" xmi.id="OKkXVMSE6kgs" widgetbid="AiGjFaDtZeiT" totalcountb="2" type="512" textcolor="none" usefillcolor="0" linewidth="none">
+         <assocwidget indexa="2" indexb="1" usesdiagramusefillcolor="1" widgetaid="yV2zoyqSA54n" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="3" xmi.id="OKkXVMSE6kgs" widgetbid="AiGjFaDtZeiT" totalcountb="2" type="512" textcolor="none" usefillcolor="0" linewidth="none">
           <linepath>
            <startpoint startx="831" starty="545"/>
            <endpoint endx="888" endy="545"/>
@@ -380,35 +530,43 @@
     </UML:Model>
     <UML:Model stereotype="folder" visibility="public" isSpecification="false" namespace="m1" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="Component View" name="Component View">
      <UML:Namespace.ownedElement>
-      <UML:Component visibility="public" isSpecification="false" namespace="Component View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="a6EnETLoILKb" name="UI" executable="0"/>
-      <UML:Component visibility="public" isSpecification="false" namespace="Component View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="UzEJWmruDuUE" name="Controller" executable="0"/>
-      <UML:Component visibility="public" isSpecification="false" namespace="Component View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="fuDsEocmsrX4" name="Services" executable="0"/>
-      <UML:Dependency visibility="public" isSpecification="false" namespace="Component View" supplier="UzEJWmruDuUE" xmi.id="IstaCB9gAN0e" client="a6EnETLoILKb" name="android xml"/>
-      <UML:Dependency visibility="public" isSpecification="false" namespace="Component View" supplier="fuDsEocmsrX4" xmi.id="Xg6f34IAtpWa" client="UzEJWmruDuUE" name="IntentServices"/>
+      <UML:Component visibility="public" isSpecification="false" namespace="Component View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="a6EnETLoILKb" name="GUI" executable="0"/>
+      <UML:Component visibility="public" isSpecification="false" namespace="Component View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="UzEJWmruDuUE" name="Client" executable="0"/>
+      <UML:Component visibility="public" isSpecification="false" namespace="Component View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="fuDsEocmsrX4" name="Service" executable="0"/>
+      <UML:Dependency visibility="public" isSpecification="false" namespace="Component View" supplier="UzEJWmruDuUE" xmi.id="IstaCB9gAN0e" client="a6EnETLoILKb" name="interacts with"/>
+      <UML:Dependency visibility="public" isSpecification="false" namespace="Component View" supplier="fuDsEocmsrX4" xmi.id="Xg6f34IAtpWa" client="UzEJWmruDuUE" name="requests"/>
      </UML:Namespace.ownedElement>
      <XMI.extension xmi.extender="umbrello">
       <diagrams>
-       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" textcolor="#000000" isopen="1" showpackage="1" showpubliconly="1" showstereotype="1" name="leap_android component diagram" font="Sans Serif,9,-1,0,50,0,0,0,0,0" canvasheight="913" canvaswidth="1601" localid="-1" snapcsgrid="0" showgrid="0" showops="1" griddotcolor="#808080" backgroundcolor="#ffffff" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="cr2WJ9gfrZYX" documentation="" showscope="1" snapgrid="0" showatts="1" type="7">
+       <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" textcolor="#000000" isopen="1" showpackage="1" showpubliconly="0" showstereotype="1" name="leap_android component diagram" font="Sans Serif,9,-1,0,50,0,0,0,0,0" canvasheight="350" canvaswidth="703" localid="-1" snapcsgrid="0" showgrid="0" showops="1" griddotcolor="#808080" backgroundcolor="#ffffff" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="cr2WJ9gfrZYX" documentation="" showscope="1" snapgrid="0" showatts="1" type="7">
         <widgets>
          <componentwidget width="100" showstereotype="1" x="112" usesdiagramusefillcolor="1" y="104" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="56" linecolor="none" xmi.id="a6EnETLoILKb" textcolor="#000000" usefillcolor="1" linewidth="none" font="Sans Serif,9,-1,0,75,0,0,0,0,0"/>
-         <componentwidget width="124" showstereotype="1" x="382" usesdiagramusefillcolor="1" y="103" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="56" linecolor="none" xmi.id="UzEJWmruDuUE" textcolor="#000000" usefillcolor="1" linewidth="none" font="Sans Serif,9,-1,0,75,0,0,0,0,0"/>
-         <componentwidget width="114" showstereotype="1" x="381" usesdiagramusefillcolor="1" y="251" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="56" linecolor="none" xmi.id="fuDsEocmsrX4" textcolor="#000000" usefillcolor="1" linewidth="none" font="Sans Serif,9,-1,0,75,0,0,0,0,0"/>
+         <componentwidget width="124" showstereotype="1" x="117" usesdiagramusefillcolor="1" y="290" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="56" linecolor="none" xmi.id="UzEJWmruDuUE" textcolor="#000000" usefillcolor="1" linewidth="none" font="Sans Serif,9,-1,0,75,0,0,0,0,0"/>
+         <componentwidget width="114" showstereotype="1" x="585" usesdiagramusefillcolor="1" y="290" usesdiagramfillcolor="1" isinstance="0" fillcolor="none" height="56" linecolor="none" xmi.id="fuDsEocmsrX4" textcolor="#000000" usefillcolor="1" linewidth="none" font="Sans Serif,9,-1,0,75,0,0,0,0,0"/>
         </widgets>
         <messages/>
         <associations>
-         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="80" widgetaid="a6EnETLoILKb" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="2" xmi.id="IstaCB9gAN0e" widgetbid="UzEJWmruDuUE" totalcountb="2" type="502" textcolor="none" usefillcolor="0" linewidth="none">
+         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="0" widgetaid="a6EnETLoILKb" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="#ff0000" totalcounta="2" xmi.id="IstaCB9gAN0e" widgetbid="UzEJWmruDuUE" totalcountb="2" type="502" textcolor="#000000" usefillcolor="0" linewidth="0">
           <linepath>
-           <startpoint startx="212" starty="116"/>
-           <endpoint endx="382" endy="116"/>
+           <startpoint startx="212" starty="160"/>
+           <endpoint endx="212" endy="290"/>
           </linepath>
-          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" textcolor="none" usesdiagramusefillcolor="1" x="297" showstereotype="1" y="116" text="android xml" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="703" width="76" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="LBfIqNusZV87" height="17"/>
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" textcolor="#000000" usesdiagramusefillcolor="1" x="156" showstereotype="1" y="211" text="interacts with" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="703" width="86" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="WymeDzIj40Mu" height="17"/>
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" textcolor="#000000" usesdiagramusefillcolor="1" x="215" showstereotype="1" y="161" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="15" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="tSRxSnp4Y1nY" height="17"/>
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" textcolor="#000000" usesdiagramusefillcolor="1" x="218" showstereotype="1" y="269" text="1..*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="28" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="zIARATmk8S19" height="17"/>
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" textcolor="#000000" usesdiagramusefillcolor="1" x="150" showstereotype="1" y="162" text="Activity" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="+" role="709" width="60" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="cmBk0yVdUtJL" height="17"/>
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" textcolor="#000000" usesdiagramusefillcolor="1" x="117" showstereotype="1" y="273" text="android xml" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="+" role="710" width="85" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="afiJ3aBXXvCk" height="17"/>
          </assocwidget>
-         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="32" widgetaid="UzEJWmruDuUE" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="none" totalcounta="2" xmi.id="Xg6f34IAtpWa" widgetbid="fuDsEocmsrX4" totalcountb="2" type="502" textcolor="none" usefillcolor="0" linewidth="none">
+         <assocwidget indexa="1" indexb="1" usesdiagramusefillcolor="0" widgetaid="UzEJWmruDuUE" usesdiagramfillcolor="0" fillcolor="#000000" linecolor="#ff0000" totalcounta="2" xmi.id="Xg6f34IAtpWa" widgetbid="fuDsEocmsrX4" totalcountb="2" type="502" textcolor="#000000" usefillcolor="0" linewidth="0">
           <linepath>
-           <startpoint startx="414" starty="159"/>
-           <endpoint endx="414" endy="251"/>
+           <startpoint startx="241" starty="317"/>
+           <endpoint endx="585" endy="317"/>
           </linepath>
-          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" textcolor="none" usesdiagramusefillcolor="1" x="414" showstereotype="1" y="205" text="IntentServices" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="703" width="90" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="UJJzVfIoqv6f" height="17"/>
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" textcolor="#000000" usesdiagramusefillcolor="1" x="396" showstereotype="1" y="300" text="requests" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="703" width="57" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="3Aha6rIzJhuj" height="17"/>
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" textcolor="#000000" usesdiagramusefillcolor="1" x="243" showstereotype="1" y="298" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="15" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="uAvBqpuLWgKD" height="17"/>
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" textcolor="#000000" usesdiagramusefillcolor="1" x="560" showstereotype="1" y="291" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="15" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="Frs7Zz6hooy7" height="17"/>
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" textcolor="#000000" usesdiagramusefillcolor="1" x="252" showstereotype="1" y="319" text="Notification" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="+" role="709" width="83" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="Vho1ibXfrh61" height="17"/>
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" textcolor="#000000" usesdiagramusefillcolor="1" x="491" showstereotype="1" y="325" text="IntentService" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="+" role="710" width="93" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="ArkGJjOKu5uy" height="17"/>
          </assocwidget>
         </associations>
        </diagram>
@@ -425,19 +583,23 @@
   </UML:Model>
  </XMI.content>
  <XMI.extensions xmi.extender="umbrello">
-  <docsettings viewid="cr2WJ9gfrZYX" uniqueid="UJJzVfIoqv6f" documentation=""/>
+  <docsettings viewid="vWwxyu3D2VXp" uniqueid="kjuriemx7mtu" documentation=""/>
   <listview>
    <listitem open="1" type="800" id="Views">
     <listitem open="1" type="821" id="Component View">
      <listitem open="1" type="822" id="UzEJWmruDuUE"/>
+     <listitem open="1" type="822" id="a6EnETLoILKb"/>
      <listitem open="0" type="819" id="cr2WJ9gfrZYX" label="leap_android component diagram"/>
      <listitem open="1" type="822" id="fuDsEocmsrX4"/>
-     <listitem open="1" type="822" id="a6EnETLoILKb"/>
     </listitem>
     <listitem open="1" type="827" id="Deployment View"/>
     <listitem open="1" type="836" id="Entity Relationship Model"/>
-    <listitem open="0" type="801" id="Logical View">
-     <listitem open="1" type="830" id="Datatypes">
+    <listitem open="1" type="801" id="Logical View">
+     <listitem open="1" type="818" id="WmXThANmPyRt"/>
+     <listitem open="1" type="813" id="KSSNKQHTLQJ8"/>
+     <listitem open="1" type="813" id="V7uu3MosxvKW"/>
+     <listitem open="1" type="813" id="ESv0mjqGVLkA"/>
+     <listitem open="0" type="830" id="Datatypes">
       <listitem open="1" type="829" id="FTPrZZljwhWK"/>
       <listitem open="1" type="829" id="bs91Li1cDC4U"/>
       <listitem open="1" type="829" id="x6EAUKpWSGyE"/>
@@ -453,8 +615,18 @@
       <listitem open="1" type="829" id="Te4nRejJyTgT"/>
       <listitem open="1" type="829" id="bnxADldcXROJ"/>
      </listitem>
+     <listitem open="1" type="818" id="PqejKem6nMps"/>
+     <listitem open="0" type="807" id="5FchWsAGezbV" label="leap_android main class diagram"/>
+     <listitem open="1" type="813" id="Kcc1wpGniLKf"/>
+     <listitem open="1" type="813" id="S2RGyWoIwEdH"/>
+     <listitem open="1" type="813" id="euixKz5cbibV"/>
+     <listitem open="1" type="813" id="XsGDBbqdbHsX"/>
+     <listitem open="1" type="813" id="oepktQzVIfTa"/>
+     <listitem open="1" type="813" id="eYCDEoikexxp"/>
+     <listitem open="1" type="813" id="YmR91JgpxTYo"/>
+     <listitem open="1" type="818" id="ob9SZixyZcfr"/>
     </listitem>
-    <listitem open="0" type="802" id="Use Case View">
+    <listitem open="1" type="802" id="Use Case View">
      <listitem open="1" type="812" id="Psks5Jf2nwuD"/>
      <listitem open="1" type="812" id="1m2PMde21Jyt"/>
      <listitem open="1" type="812" id="C7bm7xDSihsM"/>