You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ja...@apache.org on 2012/05/02 09:28:51 UTC

svn commit: r1332943 - in /rave/site/trunk/content: binaries/components_diagram.odg documentation/components.mdtext images/components_diagram.svg

Author: jasha
Date: Wed May  2 07:28:50 2012
New Revision: 1332943

URL: http://svn.apache.org/viewvc?rev=1332943&view=rev
Log:
First step to architectural diagram

Added:
    rave/site/trunk/content/documentation/components.mdtext
Modified:
    rave/site/trunk/content/binaries/components_diagram.odg
    rave/site/trunk/content/images/components_diagram.svg

Modified: rave/site/trunk/content/binaries/components_diagram.odg
URL: http://svn.apache.org/viewvc/rave/site/trunk/content/binaries/components_diagram.odg?rev=1332943&r1=1332942&r2=1332943&view=diff
==============================================================================
Binary files - no diff available.

Added: rave/site/trunk/content/documentation/components.mdtext
URL: http://svn.apache.org/viewvc/rave/site/trunk/content/documentation/components.mdtext?rev=1332943&view=auto
==============================================================================
--- rave/site/trunk/content/documentation/components.mdtext (added)
+++ rave/site/trunk/content/documentation/components.mdtext Wed May  2 07:28:50 2012
@@ -0,0 +1,58 @@
+Title:  Components
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+## Components in the demo setup
+
+The demo setup comes with 4 webapps
+
+### Portal
+URL: http://localhost:8080/portal
+
+The portal is responsible for rendering and managing pages, user profiles.
+Access to the portal is restricted by Spring Security. In the demo setup an embedded ApacheDS instance is bundled to
+demonstrate LDAP authentication.
+
+The portal stores its data in an H2 database through OpenJPA. This database is shared with Shindig and can be accessed
+on http://localhost:11111
+
+### Shindig
+URL: http://localhost:8080/ (root context)
+
+Shindig is responsible for rendering OpenSocial gadgets, providing metadata for OpenSocial gadgets and the social
+context of users (group memberships).
+
+### Wookie
+URL: http://localhost:8080/wookie
+
+Wookie is responsible for rendering and providing metadata for W3C Widgets.
+
+Wookie stores its data in a Derby database through OpenJPA.
+
+### Demogadgets
+URL: http://localhost:8080/demogadgets
+
+This webapp contains (OpenSocial) gadgets that demonstrate what gadgets can do. The gadget definitions are stored
+inside the war file.
+
+## Diagram
+If you can't see the svg image, you can [download its source](../binaries/components_diagram.odg) as OpenOffice drawing.
+
+![Components diagram](../images/components_diagram.svg)
+
+
+

Modified: rave/site/trunk/content/images/components_diagram.svg
URL: http://svn.apache.org/viewvc/rave/site/trunk/content/images/components_diagram.svg?rev=1332943&r1=1332942&r2=1332943&view=diff
==============================================================================
--- rave/site/trunk/content/images/components_diagram.svg (original)
+++ rave/site/trunk/content/images/components_diagram.svg Wed May  2 07:28:50 2012
@@ -7,6 +7,7 @@
    <missing-glyph horiz-adv-x="2048" d="M 0,0 L 2047,0 2047,2047 0,2047 0,0 Z"/>
    <glyph unicode="y" horiz-adv-x="971" d="M 128,-405 L 100,-240 C 137,-251 170,-256 198,-256 236,-256 266,-249 289,-236 312,-222 330,-204 345,-180 356,-162 373,-117 397,-45 400,-35 405,-21 412,-1 L 14,1067 210,1067 425,483 C 453,409 477,331 500,250 519,306 543,374 570,453 L 782,1067 977,1067 598,-28 C 555,-141 522,-218 498,-261 466,-318 430,-360 389,-387 348,-413 299,-427 243,-427 209,-427 170,-420 128,-405 Z"/>
    <glyph unicode="w" horiz-adv-x="1502" d="M 523,0 L 318,0 -7,1067 186,1067 362,449 416,222 C 418,233 436,307 470,442 L 634,1067 834,1067 996,447 1045,244 1102,449 1279,1067 1472,1067 1145,0 940,0 777,636 732,821 523,0 Z"/>
+   <glyph unicode="u" horiz-adv-x="878" d="M 996,0 L 811,0 811,181 C 732,51 624,-14 489,-14 429,-14 373,-2 321,22 269,45 231,75 206,112 181,148 163,192 153,244 146,280 142,335 142,412 L 142,1067 327,1067 327,491 C 327,399 331,337 338,305 349,259 372,222 407,196 443,170 486,156 538,156 590,156 639,170 685,197 731,224 763,261 782,308 801,354 811,422 811,510 L 811,1067 996,1067 996,0 Z"/>
    <glyph unicode="t" horiz-adv-x="532" d="M 526,161 L 555,2 C 504,-9 459,-14 419,-14 354,-14 304,-4 268,16 232,36 207,62 193,95 178,128 171,197 171,302 L 171,896 43,896 43,1067 171,1067 171,1330 356,1438 356,1067 526,1067 526,896 356,896 356,298 C 356,249 359,217 365,203 371,189 380,177 394,169 407,161 427,156 452,156 471,156 495,158 526,161 Z"/>
    <glyph unicode="s" horiz-adv-x="902" d="M 71,327 L 256,356 C 266,291 292,242 336,208 380,174 441,156 520,156 599,156 658,171 696,201 735,230 754,265 754,304 754,340 732,368 689,388 659,402 600,420 513,441 395,475 310,504 258,528 206,553 167,587 140,630 113,673 100,721 100,773 100,821 110,865 131,905 152,946 180,980 216,1006 243,1027 280,1045 326,1059 373,1074 423,1081 476,1081 557,1081 627,1068 688,1043 748,1018 793,984 822,941 851,898 871,840 882,768 L 697,740 C 690,793 669,835 635,865 601,895 552,910 490,910 416,910 363,898 332,875 300,851 284,823 284,792 284,772 291,753 304,737 317,721 338,707 366,696 382,690 429,677 508,656 621,622 706,594 761,572 816,550 860,519 891,477 923,436 939,384 939,323 939,263 921,206 887,153 853,100 803,59 738,29 673,0 600,-14 518,-14 382,-14 278,14 207,72 136,129 91,214 71,327 Z"/>
    <glyph unicode="r" horiz-adv-x="578" d="M 327,0 L 142,0 142,1067 299,1067 299,911 C 340,980 378,1026 412,1048 447,1070 486,1081 527,1081 588,1081 649,1065 711,1034 L 649,867 C 607,896 565,910 522,910 484,910 450,898 420,874 390,850 369,817 356,774 337,710 327,639 327,562 L 327,0 Z"/>
@@ -45,6 +46,7 @@
    <glyph unicode="8" horiz-adv-x="971" d="M 376,816 C 301,843 246,881 210,930 174,980 156,1039 156,1109 156,1213 194,1301 268,1372 343,1444 442,1479 566,1479 691,1479 791,1443 867,1370 943,1297 981,1208 981,1104 981,1037 964,979 928,930 893,881 839,843 767,816 855,786 923,737 969,670 1015,602 1038,522 1038,429 1038,300 995,191 909,103 823,15 709,-28 569,-28 428,-28 315,16 229,104 143,192 100,302 100,434 100,532 123,614 171,680 219,747 287,792 376,816 Z M 341,1108 C 341,1045 361,995 402,955 442,916 498,896 571,896 642,896 697,916 737,955 777,994 796,1042 796,1099 796,1158 776,1208 735,1248 694,1288 638,1308 569,1308 499,1308 443,1289 403,1249 362,1210 341,1163 341,1108 Z M 284,437 C 284,386 295,338 316,290 336,243 371,207 419,181 467,155 518,142 570,142 657,142 726,169 777,224 828,278 853,347 853,431 853,516 827,586 774,642 722,698 652,725 565,725 479,725 411,698 360,643 310,588 284,519 284,437 Z"/>
    <glyph unicode="3" horiz-adv-x="971" d="M 100,384 L 284,412 C 304,317 337,248 383,206 428,163 488,142 562,142 648,142 718,171 772,228 826,285 853,355 853,440 853,520 827,586 775,638 723,691 656,717 576,717 543,717 502,710 453,697 L 473,868 C 484,866 493,866 500,866 573,866 638,884 695,922 753,959 782,1017 782,1094 782,1156 761,1207 718,1248 675,1288 620,1308 552,1308 485,1308 429,1288 385,1248 340,1208 311,1147 299,1067 L 114,1095 C 135,1217 184,1312 261,1379 337,1446 432,1479 546,1479 625,1479 697,1462 763,1428 829,1394 880,1347 915,1288 950,1229 967,1167 967,1100 967,1037 950,980 916,928 882,877 832,835 765,805 852,785 919,742 967,678 1014,614 1038,534 1038,438 1038,308 993,198 901,107 810,17 695,-28 555,-28 429,-28 325,10 242,86 159,163 111,262 100,384 Z"/>
    <glyph unicode="2" horiz-adv-x="971" d="M 304,185 L 1024,185 1024,0 57,0 C 56,45 62,88 77,130 101,198 139,265 191,331 244,396 321,469 422,550 579,682 685,784 741,857 797,930 825,1000 825,1067 825,1135 800,1192 750,1238 699,1285 634,1308 553,1308 468,1308 399,1285 348,1237 297,1189 271,1123 270,1038 L 85,1067 C 98,1201 145,1303 227,1374 309,1444 419,1479 557,1479 696,1479 807,1440 888,1361 969,1283 1010,1185 1010,1069 1010,1010 998,952 976,895 953,838 915,778 862,715 810,652 720,567 593,460 485,372 416,312 384,280 352,248 325,217 304,185 Z"/>
+   <glyph unicode="1" horiz-adv-x="555" d="M 768,1479 L 768,0 583,0 583,1153 C 540,1111 484,1070 415,1028 345,987 283,955 228,935 L 228,1109 C 328,1157 415,1214 490,1282 565,1350 618,1415 649,1479 L 768,1479 Z"/>
    <glyph unicode="0" horiz-adv-x="971" d="M 100,725 C 100,899 117,1041 152,1150 187,1259 239,1341 308,1396 377,1451 464,1479 569,1479 646,1479 715,1463 776,1431 836,1399 884,1353 920,1293 956,1233 984,1160 1006,1074 1027,988 1038,871 1038,725 1038,552 1021,411 986,302 952,193 900,111 831,55 761,-1 674,-28 569,-28 430,-28 321,20 242,118 147,245 100,448 100,725 Z M 284,725 C 284,487 312,330 366,255 421,180 489,142 569,142 649,142 717,180 771,255 826,331 853,487 853,725 853,960 827,1116 773,1193 720,1270 651,1308 567,1308 487,1308 421,1274 371,1206 313,1120 284,959 284,725 Z"/>
    <glyph unicode="/" horiz-adv-x="601" d="M 162,0 L 0,0 427,1465 589,1465 162,0 Z"/>
    <glyph unicode=")" horiz-adv-x="509" d="M 242,-412 L 114,-412 C 322,-100 427,213 427,526 427,649 412,770 382,890 358,988 325,1082 282,1172 255,1230 199,1328 114,1465 L 242,1465 C 372,1301 469,1137 531,973 585,831 612,682 612,527 612,351 576,181 504,17 432,-147 345,-290 242,-412 Z"/>
@@ -59,324 +61,339 @@
  </g>
  <g visibility="visible" id="Slide_1_page1">
   <g>
-   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" id="Drawing_1_Apache_Tomcat_0" stroke-linejoin="round" d="M 10350,18300 L 1400,18300 1400,10200 19300,10200 19300,18300 10350,18300 Z"/>
+   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" id="Drawing_1_Apache_Tomcat_0" stroke-linejoin="round" d="M 10350,17400 L 1400,17400 1400,9300 19300,9300 19300,17400 10350,17400 Z"/>
   </g>
   <g id="Drawing_2">
-   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 11950,17900 L 9900,17900 9900,15100 14000,15100 14000,17900 11950,17900 Z"/>
+   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 11950,17000 L 9900,17000 9900,14200 14000,14200 14000,17000 11950,17000 Z"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="564" font-style="normal" font-weight="400">
-    <text x="11872" y="15750">/</text>
-    <text fill="rgb(0,0,0)" stroke="none" x="10492" y="16381">O</text>
-    <text x="10932" y="16381">p</text>
-    <text x="11246" y="16381">e</text>
-    <text x="11559" y="16381">n</text>
-    <text x="11872" y="16381">S</text>
-    <text x="12249" y="16381">o</text>
-    <text x="12562" y="16381">c</text>
-    <text x="12842" y="16381">i</text>
-    <text x="12969" y="16381">a</text>
-    <text x="13282" y="16381">l</text>
-    <text fill="rgb(0,0,0)" stroke="none" x="10883" y="17012">G</text>
-    <text x="11323" y="17012">a</text>
-    <text x="11637" y="17012">d</text>
-    <text x="11950" y="17012">g</text>
-    <text x="12263" y="17012">e</text>
-    <text x="12576" y="17012">t</text>
-    <text x="12733" y="17012">s</text>
-    <text fill="rgb(0,0,0)" stroke="none" x="10822" y="17643">(</text>
-    <text x="11008" y="17643">S</text>
-    <text x="11385" y="17643">h</text>
-    <text x="11698" y="17643">i</text>
-    <text x="11825" y="17643">n</text>
-    <text x="12139" y="17643">d</text>
-    <text x="12452" y="17643">i</text>
-    <text x="12579" y="17643">g</text>
-    <text x="12892" y="17643">)</text>
+    <text x="11872" y="14850">/</text>
+    <text fill="rgb(0,0,0)" stroke="none" x="10492" y="15481">O</text>
+    <text x="10932" y="15481">p</text>
+    <text x="11246" y="15481">e</text>
+    <text x="11559" y="15481">n</text>
+    <text x="11872" y="15481">S</text>
+    <text x="12249" y="15481">o</text>
+    <text x="12562" y="15481">c</text>
+    <text x="12842" y="15481">i</text>
+    <text x="12969" y="15481">a</text>
+    <text x="13282" y="15481">l</text>
+    <text fill="rgb(0,0,0)" stroke="none" x="10883" y="16112">G</text>
+    <text x="11323" y="16112">a</text>
+    <text x="11637" y="16112">d</text>
+    <text x="11950" y="16112">g</text>
+    <text x="12263" y="16112">e</text>
+    <text x="12576" y="16112">t</text>
+    <text x="12733" y="16112">s</text>
+    <text fill="rgb(0,0,0)" stroke="none" x="10822" y="16743">(</text>
+    <text x="11008" y="16743">S</text>
+    <text x="11385" y="16743">h</text>
+    <text x="11698" y="16743">i</text>
+    <text x="11825" y="16743">n</text>
+    <text x="12139" y="16743">d</text>
+    <text x="12452" y="16743">i</text>
+    <text x="12579" y="16743">g</text>
+    <text x="12892" y="16743">)</text>
    </g>
   </g>
   <g id="Drawing_3">
-   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 4150,18000 L 2100,18000 2100,15200 6200,15200 6200,18000 4150,18000 Z"/>
+   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 4150,17100 L 2100,17100 2100,14300 6200,14300 6200,17100 4150,17100 Z"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="564" font-style="normal" font-weight="400">
-    <text x="3194" y="16166">/</text>
-    <text x="3351" y="16166">w</text>
-    <text x="3757" y="16166">o</text>
-    <text x="4070" y="16166">o</text>
-    <text x="4384" y="16166">k</text>
-    <text x="4667" y="16166">i</text>
-    <text x="4794" y="16166">e</text>
-    <text fill="rgb(0,0,0)" stroke="none" x="2427" y="16797">W</text>
-    <text x="2960" y="16797">3</text>
-    <text x="3274" y="16797">C</text>
-    <text x="3680" y="16797"> </text>
-    <text x="3837" y="16797">W</text>
-    <text x="4370" y="16797">i</text>
-    <text x="4493" y="16797">d</text>
-    <text x="4810" y="16797">g</text>
-    <text x="5124" y="16797">e</text>
-    <text x="5437" y="16797">t</text>
-    <text x="5594" y="16797">s</text>
-    <text fill="rgb(0,0,0)" stroke="none" x="3026" y="17428">(</text>
-    <text x="3212" y="17428">W</text>
-    <text x="3737" y="17428">o</text>
-    <text x="4050" y="17428">o</text>
-    <text x="4364" y="17428">k</text>
-    <text x="4647" y="17428">i</text>
-    <text x="4770" y="17428">e</text>
-    <text x="5083" y="17428">)</text>
+    <text x="3194" y="15266">/</text>
+    <text x="3351" y="15266">w</text>
+    <text x="3757" y="15266">o</text>
+    <text x="4070" y="15266">o</text>
+    <text x="4384" y="15266">k</text>
+    <text x="4667" y="15266">i</text>
+    <text x="4794" y="15266">e</text>
+    <text fill="rgb(0,0,0)" stroke="none" x="2427" y="15897">W</text>
+    <text x="2960" y="15897">3</text>
+    <text x="3274" y="15897">C</text>
+    <text x="3680" y="15897"> </text>
+    <text x="3837" y="15897">W</text>
+    <text x="4370" y="15897">i</text>
+    <text x="4493" y="15897">d</text>
+    <text x="4810" y="15897">g</text>
+    <text x="5124" y="15897">e</text>
+    <text x="5437" y="15897">t</text>
+    <text x="5594" y="15897">s</text>
+    <text fill="rgb(0,0,0)" stroke="none" x="3026" y="16528">(</text>
+    <text x="3212" y="16528">W</text>
+    <text x="3737" y="16528">o</text>
+    <text x="4050" y="16528">o</text>
+    <text x="4364" y="16528">k</text>
+    <text x="4647" y="16528">i</text>
+    <text x="4770" y="16528">e</text>
+    <text x="5083" y="16528">)</text>
    </g>
   </g>
   <g id="Drawing_4">
-   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 16950,17899 L 14900,17899 14900,15099 19000,15099 19000,17899 16950,17899 Z"/>
+   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 16950,16999 L 14900,16999 14900,14199 19000,14199 19000,16999 16950,16999 Z"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="564" font-style="normal" font-weight="400">
-    <text x="15164" y="16696">/</text>
-    <text x="15321" y="16696">d</text>
-    <text x="15634" y="16696">e</text>
-    <text x="15947" y="16696">m</text>
-    <text x="16417" y="16696">o</text>
-    <text x="16730" y="16696">g</text>
-    <text x="17044" y="16696">a</text>
-    <text x="17357" y="16696">d</text>
-    <text x="17674" y="16696">g</text>
-    <text x="17988" y="16696">e</text>
-    <text x="18301" y="16696">t</text>
-    <text x="18458" y="16696">s</text>
+    <text x="15164" y="15796">/</text>
+    <text x="15321" y="15796">d</text>
+    <text x="15634" y="15796">e</text>
+    <text x="15947" y="15796">m</text>
+    <text x="16417" y="15796">o</text>
+    <text x="16730" y="15796">g</text>
+    <text x="17044" y="15796">a</text>
+    <text x="17357" y="15796">d</text>
+    <text x="17674" y="15796">g</text>
+    <text x="17988" y="15796">e</text>
+    <text x="18301" y="15796">t</text>
+    <text x="18458" y="15796">s</text>
    </g>
   </g>
   <g id="Drawing_5">
-   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 8050,13800 L 6000,13800 6000,11000 10100,11000 10100,13800 8050,13800 Z"/>
+   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 8050,12900 L 6000,12900 6000,10100 10100,10100 10100,12900 8050,12900 Z"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="564" font-style="normal" font-weight="400">
-    <text x="7267" y="12597">/</text>
-    <text x="7424" y="12597">p</text>
-    <text x="7737" y="12597">o</text>
-    <text x="8050" y="12597">r</text>
-    <text x="8241" y="12597">t</text>
-    <text x="8397" y="12597">a</text>
-    <text x="8711" y="12597">l</text>
+    <text x="7267" y="11697">/</text>
+    <text x="7424" y="11697">p</text>
+    <text x="7737" y="11697">o</text>
+    <text x="8050" y="11697">r</text>
+    <text x="8241" y="11697">t</text>
+    <text x="8397" y="11697">a</text>
+    <text x="8711" y="11697">l</text>
    </g>
   </g>
   <g id="Drawing_6">
-   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 3923,23636 C 4112,23636 4301,24077 4301,24518 4301,24959 4112,25401 3923,25401 L 2277,25401 C 2088,25401 1900,24959 1900,24518 1900,24077 2088,23636 2277,23636 L 3923,23636 Z"/>
-   <rect fill="none" stroke="none" x="3545" y="23636" width="379" height="1766"/>
-   <path fill="rgb(207,231,245)" stroke="none" d="M 3923,23636 C 3734,23636 3545,24077 3545,24518 3545,24959 3734,25401 3923,25401 L 3923,23636 Z"/>
-   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 3923,23636 C 3734,23636 3545,24077 3545,24518 3545,24959 3734,25401 3923,25401"/>
-   <rect fill="none" stroke="none" x="1900" y="23636" width="2401" height="1765"/>
+   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 3923,22736 C 4112,22736 4301,23177 4301,23618 4301,24059 4112,24501 3923,24501 L 2277,24501 C 2088,24501 1900,24059 1900,23618 1900,23177 2088,22736 2277,22736 L 3923,22736 Z"/>
+   <rect fill="none" stroke="none" x="3545" y="22736" width="379" height="1766"/>
+   <path fill="rgb(207,231,245)" stroke="none" d="M 3923,22736 C 3734,22736 3545,23177 3545,23618 3545,24059 3734,24501 3923,24501 L 3923,22736 Z"/>
+   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 3923,22736 C 3734,22736 3545,23177 3545,23618 3545,24059 3734,24501 3923,24501"/>
+   <rect fill="none" stroke="none" x="1900" y="22736" width="2401" height="1765"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="494" font-style="normal" font-weight="400">
-    <text x="2252" y="24690">D</text>
-    <text x="2608" y="24690">e</text>
-    <text x="2883" y="24690">r</text>
-    <text x="3048" y="24690">b</text>
-    <text x="3323" y="24690">y</text>
+    <text x="2252" y="23790">D</text>
+    <text x="2608" y="23790">e</text>
+    <text x="2883" y="23790">r</text>
+    <text x="3048" y="23790">b</text>
+    <text x="3323" y="23790">y</text>
    </g>
   </g>
   <g id="Drawing_7">
-   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 10748,23700 C 10930,23700 11113,24125 11113,24550 11113,24975 10930,25401 10748,25401 L 9164,25401 C 8982,25401 8800,24975 8800,24550 8800,24125 8982,23700 9164,23700 L 10748,23700 Z"/>
-   <rect fill="none" stroke="none" x="10384" y="23700" width="365" height="1702"/>
-   <path fill="rgb(207,231,245)" stroke="none" d="M 10748,23700 C 10566,23700 10384,24125 10384,24550 10384,24975 10566,25401 10748,25401 L 10748,23700 Z"/>
-   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 10748,23700 C 10566,23700 10384,24125 10384,24550 10384,24975 10566,25401 10748,25401"/>
-   <rect fill="none" stroke="none" x="8800" y="23700" width="2313" height="1701"/>
+   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 10748,22800 C 10930,22800 11113,23225 11113,23650 11113,24075 10930,24501 10748,24501 L 9164,24501 C 8982,24501 8800,24075 8800,23650 8800,23225 8982,22800 9164,22800 L 10748,22800 Z"/>
+   <rect fill="none" stroke="none" x="10384" y="22800" width="365" height="1702"/>
+   <path fill="rgb(207,231,245)" stroke="none" d="M 10748,22800 C 10566,22800 10384,23225 10384,23650 10384,24075 10566,24501 10748,24501 L 10748,22800 Z"/>
+   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 10748,22800 C 10566,22800 10384,23225 10384,23650 10384,24075 10566,24501 10748,24501"/>
+   <rect fill="none" stroke="none" x="8800" y="22800" width="2313" height="1701"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="494" font-style="normal" font-weight="400">
-    <text x="9459" y="24722">H</text>
-    <text x="9815" y="24722">2</text>
+    <text x="9458" y="23644">H</text>
+    <text x="9814" y="23644">2</text>
+   </g>
+   <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="318" font-style="normal" font-weight="400">
+    <text x="8916" y="24038">(</text>
+    <text x="9022" y="24038">f</text>
+    <text x="9111" y="24038">i</text>
+    <text x="9183" y="24038">l</text>
+    <text x="9250" y="24038">e</text>
+    <text x="9428" y="24038"> </text>
+    <text x="9517" y="24038">s</text>
+    <text x="9674" y="24038">y</text>
+    <text x="9835" y="24038">s</text>
+    <text x="9996" y="24038">t</text>
+    <text x="10080" y="24038">e</text>
+    <text x="10258" y="24038">m</text>
+    <text x="10525" y="24038">)</text>
    </g>
   </g>
   <g id="Drawing_8">
-   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 3100,19100 C 3894,19100 4500,19706 4500,20500 4500,21294 3894,21900 3100,21900 2306,21900 1700,21294 1700,20500 1700,19706 2306,19100 3100,19100 Z"/>
-   <rect fill="none" stroke="none" x="1700" y="19100" width="2801" height="2801"/>
+   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 3100,18200 C 3894,18200 4500,18806 4500,19600 4500,20394 3894,21000 3100,21000 2306,21000 1700,20394 1700,19600 1700,18806 2306,18200 3100,18200 Z"/>
+   <rect fill="none" stroke="none" x="1700" y="18200" width="2801" height="2801"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="494" font-style="normal" font-weight="400">
-    <text x="2060" y="20672">O</text>
-    <text x="2445" y="20672">p</text>
-    <text x="2720" y="20672">e</text>
-    <text x="2996" y="20672">n</text>
-    <text x="3267" y="20672">J</text>
-    <text x="3516" y="20672">P</text>
-    <text x="3808" y="20672">A</text>
+    <text x="2060" y="19772">O</text>
+    <text x="2445" y="19772">p</text>
+    <text x="2720" y="19772">e</text>
+    <text x="2996" y="19772">n</text>
+    <text x="3267" y="19772">J</text>
+    <text x="3516" y="19772">P</text>
+    <text x="3808" y="19772">A</text>
    </g>
   </g>
   <g id="Drawing_9">
-   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 8700,19199 C 9494,19199 10100,19805 10100,20599 10100,21393 9494,21999 8700,21999 7906,21999 7300,21393 7300,20599 7300,19805 7906,19199 8700,19199 Z"/>
-   <rect fill="none" stroke="none" x="7300" y="19199" width="2801" height="2801"/>
+   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 8700,18299 C 9494,18299 10100,18905 10100,19699 10100,20493 9494,21099 8700,21099 7906,21099 7300,20493 7300,19699 7300,18905 7906,18299 8700,18299 Z"/>
+   <rect fill="none" stroke="none" x="7300" y="18299" width="2801" height="2801"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="494" font-style="normal" font-weight="400">
-    <text x="7660" y="20771">O</text>
-    <text x="8045" y="20771">p</text>
-    <text x="8320" y="20771">e</text>
-    <text x="8596" y="20771">n</text>
-    <text x="8867" y="20771">J</text>
-    <text x="9116" y="20771">P</text>
-    <text x="9408" y="20771">A</text>
+    <text x="7660" y="19871">O</text>
+    <text x="8045" y="19871">p</text>
+    <text x="8320" y="19871">e</text>
+    <text x="8596" y="19871">n</text>
+    <text x="8867" y="19871">J</text>
+    <text x="9116" y="19871">P</text>
+    <text x="9408" y="19871">A</text>
    </g>
   </g>
   <g id="Drawing_10">
-   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 12600,19199 C 13394,19199 14000,19805 14000,20599 14000,21393 13394,21999 12600,21999 11806,21999 11200,21393 11200,20599 11200,19805 11806,19199 12600,19199 Z"/>
-   <rect fill="none" stroke="none" x="11200" y="19199" width="2801" height="2801"/>
+   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 12600,18299 C 13394,18299 14000,18905 14000,19699 14000,20493 13394,21099 12600,21099 11806,21099 11200,20493 11200,19699 11200,18905 11806,18299 12600,18299 Z"/>
+   <rect fill="none" stroke="none" x="11200" y="18299" width="2801" height="2801"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="494" font-style="normal" font-weight="400">
-    <text x="11560" y="20771">O</text>
-    <text x="11945" y="20771">p</text>
-    <text x="12220" y="20771">e</text>
-    <text x="12496" y="20771">n</text>
-    <text x="12767" y="20771">J</text>
-    <text x="13016" y="20771">P</text>
-    <text x="13308" y="20771">A</text>
+    <text x="11560" y="19871">O</text>
+    <text x="11945" y="19871">p</text>
+    <text x="12220" y="19871">e</text>
+    <text x="12496" y="19871">n</text>
+    <text x="12767" y="19871">J</text>
+    <text x="13016" y="19871">P</text>
+    <text x="13308" y="19871">A</text>
    </g>
   </g>
   <g>
-   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_11_0" stroke-linejoin="round" d="M 8050,13800 L 8050,18500 8700,18500 8700,19199"/>
+   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_11_0" stroke-linejoin="round" d="M 8050,12900 L 8050,17600 8700,17600 8700,18299"/>
   </g>
   <g>
-   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_12_0" stroke-linejoin="round" d="M 11950,17900 L 11950,18500 12600,18500 12600,19199"/>
+   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_12_0" stroke-linejoin="round" d="M 11950,17000 L 11950,17600 12600,17600 12600,18299"/>
   </g>
   <g>
-   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_13_0" stroke-linejoin="round" d="M 4150,18000 L 4150,18550 3100,18550 3100,19100"/>
+   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_13_0" stroke-linejoin="round" d="M 4150,17100 L 4150,17650 3100,17650 3100,18200"/>
   </g>
   <g>
-   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_14_0" stroke-linejoin="round" d="M 3100,21900 L 3100,23636"/>
+   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_14_0" stroke-linejoin="round" d="M 3100,21000 L 3100,22736"/>
   </g>
   <g>
-   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_15_0" stroke-linejoin="round" d="M 8700,21999 L 8700,22850 9956,22850 9956,23700"/>
+   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_15_0" stroke-linejoin="round" d="M 8700,21099 L 8700,21950 9956,21950 9956,22800"/>
   </g>
   <g>
-   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_16_0" stroke-linejoin="round" d="M 12600,21999 L 12600,22850 9956,22850 9956,23700"/>
+   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_16_0" stroke-linejoin="round" d="M 12600,21099 L 12600,21950 9956,21950 9956,22800"/>
   </g>
   <g id="Drawing_17">
-   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 5557,4189 C 5380,3485 6211,2819 7042,2819 7304,2814 7575,2883 7798,2986 8011,2666 8407,2471 8851,2471 9146,2482 9460,2577 9682,2748 9842,2466 10180,2300 10545,2300 10851,2300 11131,2421 11309,2606 11514,2416 11820,2300 12140,2300 12660,2300 13100,2598 13194,3015 13696,3131 14060,3508 14060,3941 14060,4073 14034,4200 13958,4321 14172,4532 14301,4794 14301,5060 14301,5665 13727,6174 12989,6261 12989,6839 12420,7293 11709,7293 11465,7293 11234,7238 11029,7132 10842,7642 10251,8000 9589,8000 9096,8000 8629,7787 8349,7449 8087,7578 8224,7655 7473,7655 6855,7655 6286,7388 5989,6955 5277,6945 4913,6602 4913,6169 4913,5968 5006,5786 5175,5636 4868,5509 4700,5258 4700,4971 4700,4567 5073,4234 5557,4189 L 5557,4189 Z"/>
-   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 5557,4189 C 5566,4255 5606,4329 5628,4390"/>
-   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 7798,2986 C 7900,3036 8024,3105 8109,3173"/>
-   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 9682,2748 C 9647,2804 9624,2870 9602,2933"/>
-   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 11309,2606 C 11242,2669 11207,2753 11162,2830"/>
-   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 13194,3015 C 13203,3062 13247,3168 13229,3192"/>
-   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 13958,4321 C 13883,4456 13780,4575 13638,4672"/>
-   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 12994,6261 C 13029,6047 12825,5520 12256,5322"/>
-   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 11029,7132 C 11065,7045 11078,6966 11087,6881"/>
-   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 8353,7449 C 8282,7380 8238,7301 8193,7219"/>
-   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 5989,6955 C 6073,6945 6157,6929 6237,6905"/>
-   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 5175,5636 C 5322,5704 5491,5765 5735,5741"/>
-   <rect fill="none" stroke="none" x="4700" y="2300" width="9601" height="5701"/>
+   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 5557,3289 C 5380,2585 6211,1919 7042,1919 7304,1914 7575,1983 7798,2086 8011,1766 8407,1571 8851,1571 9146,1582 9460,1677 9682,1848 9842,1566 10180,1400 10545,1400 10851,1400 11131,1521 11309,1706 11514,1516 11820,1400 12140,1400 12660,1400 13100,1698 13194,2115 13696,2231 14060,2608 14060,3041 14060,3173 14034,3300 13958,3421 14172,3632 14301,3894 14301,4160 14301,4765 13727,5274 12989,5361 12989,5939 12420,6393 11709,6393 11465,6393 11234,6338 11029,6232 10842,6742 10251,7100 9589,7100 9096,7100 8629,6887 8349,6549 8087,6678 8224,6755 7473,6755 6855,6755 6286,6488 5989,6055 5277,6045 4913,5702 4913,5269 4913,5068 5006,4886 5175,4736 4868,4609 4700,4358 4700,4071 4700,3667 5073,3334 5557,3289 L 5557,3289 Z"/>
+   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 5557,3289 C 5566,3355 5606,3429 5628,3490"/>
+   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 7798,2086 C 7900,2136 8024,2205 8109,2273"/>
+   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 9682,1848 C 9647,1904 9624,1970 9602,2033"/>
+   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 11309,1706 C 11242,1769 11207,1853 11162,1930"/>
+   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 13194,2115 C 13203,2162 13247,2268 13229,2292"/>
+   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 13958,3421 C 13883,3556 13780,3675 13638,3772"/>
+   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 12994,5361 C 13029,5147 12825,4620 12256,4422"/>
+   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 11029,6232 C 11065,6145 11078,6066 11087,5981"/>
+   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 8353,6549 C 8282,6480 8238,6401 8193,6319"/>
+   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 5989,6055 C 6073,6045 6157,6029 6237,6005"/>
+   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 5175,4736 C 5322,4804 5491,4865 5735,4841"/>
+   <rect fill="none" stroke="none" x="4700" y="1400" width="9601" height="5701"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="635" font-style="normal" font-weight="400">
-    <text x="8005" y="5245">B</text>
-    <text x="8428" y="5245">r</text>
-    <text x="8640" y="5245">o</text>
-    <text x="8991" y="5245">w</text>
-    <text x="9453" y="5245">s</text>
-    <text x="9770" y="5245">e</text>
-    <text x="10122" y="5245">r</text>
+    <text x="8005" y="4345">B</text>
+    <text x="8428" y="4345">r</text>
+    <text x="8640" y="4345">o</text>
+    <text x="8991" y="4345">w</text>
+    <text x="9453" y="4345">s</text>
+    <text x="9770" y="4345">e</text>
+    <text x="10122" y="4345">r</text>
    </g>
   </g>
   <g>
-   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_18_0" stroke-linejoin="round" d="M 9500,8000 L 9500,9500 8050,9500 8050,11000"/>
+   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_18_0" stroke-linejoin="round" d="M 9500,7100 L 9500,8600 8050,8600 8050,10100"/>
   </g>
   <g>
-   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_19_0" stroke-linejoin="round" d="M 9500,8000 L 9500,9500 11950,9500 11950,15100"/>
+   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_19_0" stroke-linejoin="round" d="M 9500,7100 L 9500,8600 11950,8600 11950,14200"/>
   </g>
   <g>
-   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_20_0" stroke-linejoin="round" d="M 9500,8000 L 9500,9500 4150,9500 4150,15200"/>
+   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_20_0" stroke-linejoin="round" d="M 9500,7100 L 9500,8600 4150,8600 4150,14300"/>
   </g>
   <g>
-   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_21_0" stroke-linejoin="round" d="M 14000,16500 L 14450,16500 14450,16499 14900,16499"/>
+   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_21_0" stroke-linejoin="round" d="M 14000,15600 L 14450,15600 14450,15599 14900,15599"/>
   </g>
   <g id="Drawing_22">
-   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 6750,26100 C 7515,26100 8100,26685 8100,27450 8100,28215 7515,28800 6750,28800 5985,28800 5400,28215 5400,27450 5400,26685 5985,26100 6750,26100 Z"/>
-   <rect fill="none" stroke="none" x="5400" y="26100" width="2701" height="2701"/>
+   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 6750,25200 C 7515,25200 8100,25785 8100,26550 8100,27315 7515,27900 6750,27900 5985,27900 5400,27315 5400,26550 5400,25785 5985,25200 6750,25200 Z"/>
+   <rect fill="none" stroke="none" x="5400" y="25200" width="2701" height="2701"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="494" font-style="normal" font-weight="400">
-    <text x="5569" y="27622">A</text>
-    <text x="5899" y="27622">p</text>
-    <text x="6174" y="27622">a</text>
-    <text x="6450" y="27622">c</text>
-    <text x="6695" y="27622">h</text>
-    <text x="6970" y="27622">e</text>
-    <text x="7245" y="27622">D</text>
-    <text x="7601" y="27622">S</text>
+    <text x="5569" y="26722">A</text>
+    <text x="5899" y="26722">p</text>
+    <text x="6174" y="26722">a</text>
+    <text x="6450" y="26722">c</text>
+    <text x="6695" y="26722">h</text>
+    <text x="6970" y="26722">e</text>
+    <text x="7245" y="26722">D</text>
+    <text x="7601" y="26722">S</text>
    </g>
   </g>
   <g>
-   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_23_0" stroke-linejoin="round" d="M 8050,13800 L 8050,18500 6750,18500 6750,26100"/>
+   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_23_0" stroke-linejoin="round" d="M 8050,12900 L 8050,17600 6750,17600 6750,25200"/>
   </g>
   <g>
-   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_24_0" stroke-linejoin="round" d="M 8050,13800 L 8050,14800 4150,14800 4150,15200"/>
+   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_24_0" stroke-linejoin="round" d="M 8050,12900 L 8050,13600 4150,13600 4150,14300"/>
   </g>
   <g>
-   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_25_0" stroke-linejoin="round" d="M 8050,13800 L 8050,14800 11950,14800 11950,15100"/>
+   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_25_0" stroke-linejoin="round" d="M 8050,12900 L 8050,13550 11950,13550 11950,14200"/>
   </g>
   <g id="Drawing_26">
-   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 15900,19214 C 15900,19057 16425,18900 16950,18900 17475,18900 18001,19057 18001,19214 L 18001,20586 C 18001,20743 17475,20901 16950,20901 16425,20901 15900,20743 15900,20586 L 15900,19214 Z"/>
-   <rect fill="none" stroke="none" x="15900" y="19214" width="2102" height="316"/>
-   <path fill="rgb(207,231,245)" stroke="none" d="M 15900,19214 C 15900,19371 16425,19529 16950,19529 17475,19529 18001,19371 18001,19214 L 15900,19214 Z"/>
-   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 15900,19214 C 15900,19371 16425,19529 16950,19529 17475,19529 18001,19371 18001,19214"/>
-   <rect fill="none" stroke="none" x="15900" y="18900" width="2101" height="2001"/>
+   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 15900,18314 C 15900,18157 16425,18000 16950,18000 17475,18000 18001,18157 18001,18314 L 18001,19686 C 18001,19843 17475,20001 16950,20001 16425,20001 15900,19843 15900,19686 L 15900,18314 Z"/>
+   <rect fill="none" stroke="none" x="15900" y="18314" width="2102" height="316"/>
+   <path fill="rgb(207,231,245)" stroke="none" d="M 15900,18314 C 15900,18471 16425,18629 16950,18629 17475,18629 18001,18471 18001,18314 L 15900,18314 Z"/>
+   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 15900,18314 C 15900,18471 16425,18629 16950,18629 17475,18629 18001,18471 18001,18314"/>
+   <rect fill="none" stroke="none" x="15900" y="18000" width="2101" height="2001"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="494" font-style="normal" font-weight="400">
-    <text x="16072" y="19952">G</text>
-    <text x="16457" y="19952">a</text>
-    <text x="16732" y="19952">d</text>
-    <text x="17008" y="19952">g</text>
-    <text x="17279" y="19952">e</text>
-    <text x="17554" y="19952">t</text>
-    <text x="17693" y="19952"> </text>
-    <text fill="rgb(0,0,0)" stroke="none" x="16483" y="20507">d</text>
-    <text x="16758" y="20507">e</text>
-    <text x="17033" y="20507">f</text>
-    <text x="17169" y="20507">s</text>
+    <text x="16072" y="19052">G</text>
+    <text x="16457" y="19052">a</text>
+    <text x="16732" y="19052">d</text>
+    <text x="17008" y="19052">g</text>
+    <text x="17279" y="19052">e</text>
+    <text x="17554" y="19052">t</text>
+    <text x="17693" y="19052"> </text>
+    <text fill="rgb(0,0,0)" stroke="none" x="16483" y="19607">d</text>
+    <text x="16758" y="19607">e</text>
+    <text x="17033" y="19607">f</text>
+    <text x="17169" y="19607">s</text>
    </g>
   </g>
   <g>
-   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_27_0" stroke-linejoin="round" d="M 16950,17899 L 16950,18900"/>
+   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_27_0" stroke-linejoin="round" d="M 16950,16999 L 16950,18000"/>
   </g>
   <g id="Drawing_28">
-   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 9100,26814 C 9100,26657 9625,26500 10150,26500 10675,26500 11201,26657 11201,26814 L 11201,28186 C 11201,28343 10675,28501 10150,28501 9625,28501 9100,28343 9100,28186 L 9100,26814 Z"/>
-   <rect fill="none" stroke="none" x="9100" y="26814" width="2102" height="316"/>
-   <path fill="rgb(207,231,245)" stroke="none" d="M 9100,26814 C 9100,26971 9625,27129 10150,27129 10675,27129 11201,26971 11201,26814 L 9100,26814 Z"/>
-   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 9100,26814 C 9100,26971 9625,27129 10150,27129 10675,27129 11201,26971 11201,26814"/>
-   <rect fill="none" stroke="none" x="9100" y="26500" width="2101" height="2001"/>
+   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 9100,25914 C 9100,25757 9625,25600 10150,25600 10675,25600 11201,25757 11201,25914 L 11201,27286 C 11201,27443 10675,27601 10150,27601 9625,27601 9100,27443 9100,27286 L 9100,25914 Z"/>
+   <rect fill="none" stroke="none" x="9100" y="25914" width="2102" height="316"/>
+   <path fill="rgb(207,231,245)" stroke="none" d="M 9100,25914 C 9100,26071 9625,26229 10150,26229 10675,26229 11201,26071 11201,25914 L 9100,25914 Z"/>
+   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 9100,25914 C 9100,26071 9625,26229 10150,26229 10675,26229 11201,26071 11201,25914"/>
+   <rect fill="none" stroke="none" x="9100" y="25600" width="2101" height="2001"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="494" font-style="normal" font-weight="400">
-    <text x="9615" y="27829">L</text>
-    <text x="9890" y="27829">D</text>
-    <text x="10246" y="27829">I</text>
-    <text x="10385" y="27829">F</text>
+    <text x="9615" y="26929">L</text>
+    <text x="9890" y="26929">D</text>
+    <text x="10246" y="26929">I</text>
+    <text x="10385" y="26929">F</text>
    </g>
   </g>
   <g>
-   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_29_0" stroke-linejoin="round" d="M 8100,27450 L 8600,27450 8600,27500 9100,27500"/>
+   <path fill="none" stroke="rgb(128,128,128)" id="Drawing_29_0" stroke-linejoin="round" d="M 8100,26550 L 8600,26550 8600,26600 9100,26600"/>
   </g>
   <g id="Drawing_30">
-   <rect fill="none" stroke="none" x="9033" y="14279" width="2268" height="722"/>
+   <rect fill="none" stroke="none" x="9033" y="13379" width="2268" height="722"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="423" font-style="normal" font-weight="400">
-    <text x="9283" y="14785">M</text>
-    <text x="9634" y="14785">e</text>
-    <text x="9871" y="14785">t</text>
-    <text x="9990" y="14785">a</text>
-    <text x="10223" y="14785">d</text>
-    <text x="10460" y="14785">a</text>
-    <text x="10693" y="14785">t</text>
-    <text x="10811" y="14785">a</text>
+    <text x="9283" y="13885">M</text>
+    <text x="9634" y="13885">e</text>
+    <text x="9871" y="13885">t</text>
+    <text x="9990" y="13885">a</text>
+    <text x="10223" y="13885">d</text>
+    <text x="10460" y="13885">a</text>
+    <text x="10693" y="13885">t</text>
+    <text x="10811" y="13885">a</text>
    </g>
   </g>
   <g id="Drawing_31">
-   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 15899,19213 C 15899,19056 16424,18899 16949,18899 17474,18899 18000,19056 18000,19213 L 18000,20585 C 18000,20742 17474,20900 16949,20900 16424,20900 15899,20742 15899,20585 L 15899,19213 Z"/>
-   <rect fill="none" stroke="none" x="15899" y="19213" width="2102" height="316"/>
-   <path fill="rgb(207,231,245)" stroke="none" d="M 15899,19213 C 15899,19370 16424,19528 16949,19528 17474,19528 18000,19370 18000,19213 L 15899,19213 Z"/>
-   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 15899,19213 C 15899,19370 16424,19528 16949,19528 17474,19528 18000,19370 18000,19213"/>
-   <rect fill="none" stroke="none" x="15899" y="18899" width="2101" height="2001"/>
+   <path fill="rgb(207,231,245)" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 15899,18313 C 15899,18156 16424,17999 16949,17999 17474,17999 18000,18156 18000,18313 L 18000,19685 C 18000,19842 17474,20000 16949,20000 16424,20000 15899,19842 15899,19685 L 15899,18313 Z"/>
+   <rect fill="none" stroke="none" x="15899" y="18313" width="2102" height="316"/>
+   <path fill="rgb(207,231,245)" stroke="none" d="M 15899,18313 C 15899,18470 16424,18628 16949,18628 17474,18628 18000,18470 18000,18313 L 15899,18313 Z"/>
+   <path fill="none" stroke="rgb(128,128,128)" stroke-linejoin="round" d="M 15899,18313 C 15899,18470 16424,18628 16949,18628 17474,18628 18000,18470 18000,18313"/>
+   <rect fill="none" stroke="none" x="15899" y="17999" width="2101" height="2001"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="494" font-style="normal" font-weight="400">
-    <text x="16071" y="19951">G</text>
-    <text x="16456" y="19951">a</text>
-    <text x="16731" y="19951">d</text>
-    <text x="17007" y="19951">g</text>
-    <text x="17278" y="19951">e</text>
-    <text x="17553" y="19951">t</text>
-    <text x="17692" y="19951"> </text>
-    <text fill="rgb(0,0,0)" stroke="none" x="16482" y="20506">d</text>
-    <text x="16757" y="20506">e</text>
-    <text x="17032" y="20506">f</text>
-    <text x="17168" y="20506">s</text>
+    <text x="16071" y="19051">G</text>
+    <text x="16456" y="19051">a</text>
+    <text x="16731" y="19051">d</text>
+    <text x="17007" y="19051">g</text>
+    <text x="17278" y="19051">e</text>
+    <text x="17553" y="19051">t</text>
+    <text x="17692" y="19051"> </text>
+    <text fill="rgb(0,0,0)" stroke="none" x="16482" y="19606">d</text>
+    <text x="16757" y="19606">e</text>
+    <text x="17032" y="19606">f</text>
+    <text x="17168" y="19606">s</text>
    </g>
   </g>
   <g id="Drawing_32">
-   <rect fill="none" stroke="none" x="4234" y="14280" width="2268" height="722"/>
+   <rect fill="none" stroke="none" x="4234" y="13380" width="2268" height="722"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="423" font-style="normal" font-weight="400">
-    <text x="4484" y="14786">M</text>
-    <text x="4835" y="14786">e</text>
-    <text x="5072" y="14786">t</text>
-    <text x="5191" y="14786">a</text>
-    <text x="5424" y="14786">d</text>
-    <text x="5661" y="14786">a</text>
-    <text x="5894" y="14786">t</text>
-    <text x="6012" y="14786">a</text>
+    <text x="4484" y="13886">M</text>
+    <text x="4835" y="13886">e</text>
+    <text x="5072" y="13886">t</text>
+    <text x="5191" y="13886">a</text>
+    <text x="5424" y="13886">d</text>
+    <text x="5661" y="13886">a</text>
+    <text x="5894" y="13886">t</text>
+    <text x="6012" y="13886">a</text>
    </g>
   </g>
   <g id="Drawing_33">
@@ -4335,40 +4352,96 @@ IiIiIiIiIiIiG0YBKCIiIiIiIiIismEUgCIiIiIi
 FIAiIiIiIiIiIiIb5v8B1I9cLUWRXB0AAAAASUVORK5CYII="/>
   </g>
   <g id="Drawing_34">
-   <rect fill="none" stroke="none" x="16800" y="10138" width="2319" height="883"/>
+   <rect fill="none" stroke="none" x="16800" y="9238" width="2319" height="883"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="564" font-style="normal" font-weight="400">
-    <text x="17050" y="10775">T</text>
-    <text x="17334" y="10775">o</text>
-    <text x="17647" y="10775">m</text>
-    <text x="18117" y="10775">c</text>
-    <text x="18396" y="10775">a</text>
-    <text x="18709" y="10775">t</text>
+    <text x="17050" y="9875">T</text>
+    <text x="17334" y="9875">o</text>
+    <text x="17647" y="9875">m</text>
+    <text x="18117" y="9875">c</text>
+    <text x="18396" y="9875">a</text>
+    <text x="18709" y="9875">t</text>
    </g>
   </g>
   <g id="Drawing_35">
-   <rect fill="none" stroke="none" x="4678" y="8700" width="4923" height="807"/>
+   <rect fill="none" stroke="none" x="4678" y="7800" width="4923" height="807"/>
    <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="494" font-style="normal" font-weight="400">
-    <text x="4928" y="9274">h</text>
-    <text x="5203" y="9274">t</text>
-    <text x="5339" y="9274">t</text>
-    <text x="5478" y="9274">p</text>
-    <text x="5754" y="9274">:</text>
-    <text x="5889" y="9274">/</text>
-    <text x="6024" y="9274">/</text>
-    <text x="6164" y="9274">l</text>
-    <text x="6274" y="9274">o</text>
-    <text x="6549" y="9274">c</text>
-    <text x="6795" y="9274">a</text>
-    <text x="7070" y="9274">l</text>
-    <text x="7180" y="9274">h</text>
-    <text x="7455" y="9274">o</text>
-    <text x="7730" y="9274">s</text>
-    <text x="7976" y="9274">t</text>
-    <text x="8111" y="9274">:</text>
-    <text x="8251" y="9274">8</text>
-    <text x="8526" y="9274">0</text>
-    <text x="8802" y="9274">8</text>
-    <text x="9077" y="9274">0</text>
+    <text x="4928" y="8374">h</text>
+    <text x="5203" y="8374">t</text>
+    <text x="5339" y="8374">t</text>
+    <text x="5478" y="8374">p</text>
+    <text x="5754" y="8374">:</text>
+    <text x="5889" y="8374">/</text>
+    <text x="6024" y="8374">/</text>
+    <text x="6164" y="8374">l</text>
+    <text x="6274" y="8374">o</text>
+    <text x="6549" y="8374">c</text>
+    <text x="6795" y="8374">a</text>
+    <text x="7070" y="8374">l</text>
+    <text x="7180" y="8374">h</text>
+    <text x="7455" y="8374">o</text>
+    <text x="7730" y="8374">s</text>
+    <text x="7976" y="8374">t</text>
+    <text x="8111" y="8374">:</text>
+    <text x="8251" y="8374">8</text>
+    <text x="8526" y="8374">0</text>
+    <text x="8802" y="8374">8</text>
+    <text x="9077" y="8374">0</text>
+   </g>
+  </g>
+  <g>
+   <path fill="none" stroke="rgb(0,0,0)" id="Drawing_36_0" stroke-linejoin="round" d="M 14300,4250 C 21278,4250 22872,23650 11112,23650"/>
+  </g>
+  <g id="Drawing_37">
+   <rect fill="none" stroke="none" x="10903" y="23479" width="4398" height="722"/>
+   <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="423" font-style="normal" font-weight="400">
+    <text x="11153" y="23985">h</text>
+    <text x="11390" y="23985">t</text>
+    <text x="11504" y="23985">t</text>
+    <text x="11623" y="23985">p</text>
+    <text x="11860" y="23985">:</text>
+    <text x="11974" y="23985">/</text>
+    <text x="12093" y="23985">/</text>
+    <text x="12211" y="23985">l</text>
+    <text x="12304" y="23985">o</text>
+    <text x="12542" y="23985">c</text>
+    <text x="12753" y="23985">a</text>
+    <text x="12986" y="23985">l</text>
+    <text x="13079" y="23985">h</text>
+    <text x="13316" y="23985">o</text>
+    <text x="13553" y="23985">s</text>
+    <text x="13765" y="23985">t</text>
+    <text x="13879" y="23985">:</text>
+    <text x="13998" y="23985">1</text>
+    <text x="14201" y="23985">1</text>
+    <text x="14404" y="23985">1</text>
+    <text x="14612" y="23985">1</text>
+    <text x="14815" y="23985">1</text>
+   </g>
+  </g>
+  <g id="Drawing_38">
+   <rect fill="none" stroke="none" x="6153" y="19996" width="773" height="4509"/>
+   <g fill="rgb(0,0,0)" stroke="none" font-family="Arial embedded" font-size="423" font-style="normal" font-weight="400">
+    <g transform="translate(6707,24248) rotate(-90.6) translate(-6707,-24248)">
+     <text x="6707" y="24248">L</text>
+     <text x="6944" y="24248">D</text>
+     <text x="7249" y="24248">A</text>
+     <text x="7528" y="24248">P</text>
+     <text x="7803" y="24248"> </text>
+     <text x="7922" y="24248">a</text>
+     <text x="8159" y="24248">u</text>
+     <text x="8392" y="24248">t</text>
+     <text x="8510" y="24248">h</text>
+     <text x="8743" y="24248">e</text>
+     <text x="8980" y="24248">n</text>
+     <text x="9217" y="24248">t</text>
+     <text x="9332" y="24248">i</text>
+     <text x="9429" y="24248">c</text>
+     <text x="9641" y="24248">a</text>
+     <text x="9874" y="24248">t</text>
+     <text x="9992" y="24248">i</text>
+     <text x="10085" y="24248">o</text>
+     <text x="10322" y="24248">n</text>
+    </g>
    </g>
   </g>
  </g>