From 849cb43ce97cff9d1fed41e432ae3b7a8d5e6166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 13 Oct 2014 05:03:47 +0000
Subject: [PATCH]

---
 system/FH-Complete.txp | 1132 ++++++++++++++++++++++++----------------
 system/checksystem.php |   15 +-
 2 files changed, 696 insertions(+), 451 deletions(-)

diff --git a/system/FH-Complete.txp b/system/FH-Complete.txp
index 304f656fb..f1cf819da 100644
--- a/system/FH-Complete.txp
+++ b/system/FH-Complete.txp
@@ -34008,7 +34008,7 @@
 					<FontStyle>0</FontStyle>
 					<FormatLocked>0</FormatLocked>
 					<FontHeight>-28</FontHeight>
-					<Top>1308</Top>
+					<Top>1318</Top>
 					<Left>2665</Left>
 					<z>0</z>
 					<Width>655</Width>
@@ -36020,7 +36020,7 @@
 						<Id>{33986E60-971D-45AB-863E-3389A4534998}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>2164</NamePositionX>
-					<NamePositionY>1688</NamePositionY>
+					<NamePositionY>1693</NamePositionY>
 					<Points>
 						<Point>
 							<x>2271</x>
@@ -36032,11 +36032,11 @@
 						</Point>
 						<Point>
 							<x>2634</x>
-							<y>1700</y>
+							<y>1710</y>
 						</Point>
 						<Point>
 							<x>2665</x>
-							<y>1700</y>
+							<y>1710</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -36063,7 +36063,7 @@
 						<Id>{20CDAA08-460E-4DFC-BFA0-02CCFEC43F1D}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>955</NamePositionX>
-					<NamePositionY>1164</NamePositionY>
+					<NamePositionY>1169</NamePositionY>
 					<Points>
 						<Point>
 							<x>1361</x>
@@ -36634,7 +36634,7 @@
 						<Id>{33986E60-971D-45AB-863E-3389A4534998}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>6276</NamePositionX>
-					<NamePositionY>1582</NamePositionY>
+					<NamePositionY>1587</NamePositionY>
 					<Points>
 						<Point>
 							<x>6454</x>
@@ -36646,11 +36646,11 @@
 						</Point>
 						<Point>
 							<x>3351</x>
-							<y>1779</y>
+							<y>1789</y>
 						</Point>
 						<Point>
 							<x>3320</x>
-							<y>1779</y>
+							<y>1789</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -37064,7 +37064,7 @@
 						<Id>{33986E60-971D-45AB-863E-3389A4534998}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>6139</NamePositionX>
-					<NamePositionY>1934</NamePositionY>
+					<NamePositionY>1940</NamePositionY>
 					<Points>
 						<Point>
 							<x>6450</x>
@@ -37076,11 +37076,11 @@
 						</Point>
 						<Point>
 							<x>3351</x>
-							<y>1936</y>
+							<y>1946</y>
 						</Point>
 						<Point>
 							<x>3320</x>
-							<y>1936</y>
+							<y>1946</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -37494,35 +37494,35 @@
 						<Id>{33986E60-971D-45AB-863E-3389A4534998}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>3292</NamePositionX>
-					<NamePositionY>3189</NamePositionY>
+					<NamePositionY>3359</NamePositionY>
 					<Points>
 						<Point>
 							<x>3320</x>
-							<y>1465</y>
+							<y>1475</y>
 						</Point>
 						<Point>
 							<x>3351</x>
-							<y>1465</y>
+							<y>1475</y>
 						</Point>
 						<Point>
 							<x>3351</x>
-							<y>1465</y>
+							<y>1480</y>
 						</Point>
 						<Point>
 							<x>3351</x>
-							<y>2124</y>
+							<y>2134</y>
 						</Point>
 						<Point>
 							<x>2992</x>
-							<y>2124</y>
+							<y>2139</y>
 						</Point>
 						<Point>
 							<x>2992</x>
-							<y>2124</y>
+							<y>2134</y>
 						</Point>
 						<Point>
 							<x>2992</x>
-							<y>2093</y>
+							<y>2103</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -38065,7 +38065,7 @@
 						<Id>{33986E60-971D-45AB-863E-3389A4534998}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>2058</NamePositionX>
-					<NamePositionY>1287</NamePositionY>
+					<NamePositionY>1292</NamePositionY>
 					<Points>
 						<Point>
 							<x>3727</x>
@@ -38077,11 +38077,11 @@
 						</Point>
 						<Point>
 							<x>3351</x>
-							<y>1622</y>
+							<y>1632</y>
 						</Point>
 						<Point>
 							<x>3320</x>
-							<y>1622</y>
+							<y>1632</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -51389,7 +51389,7 @@
 					<Top>1229</Top>
 					<Left>89</Left>
 					<z>0</z>
-					<Width>629</Width>
+					<Width>552</Width>
 					<Height>278</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -51426,7 +51426,7 @@
 					<Top>551</Top>
 					<Left>42</Left>
 					<z>0</z>
-					<Width>732</Width>
+					<Width>647</Width>
 					<Height>629</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -51464,7 +51464,7 @@
 					<Top>881</Top>
 					<Left>1236</Left>
 					<z>0</z>
-					<Width>647</Width>
+					<Width>563</Width>
 					<Height>1175</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -51506,7 +51506,7 @@
 					<Top>2131</Top>
 					<Left>1194</Left>
 					<z>0</z>
-					<Width>768</Width>
+					<Width>670</Width>
 					<Height>395</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -51547,7 +51547,7 @@
 					<Top>20</Top>
 					<Left>1069</Left>
 					<z>0</z>
-					<Width>599</Width>
+					<Width>528</Width>
 					<Height>824</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -51584,7 +51584,7 @@
 					<Top>2055</Top>
 					<Left>78</Left>
 					<z>0</z>
-					<Width>793</Width>
+					<Width>692</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -51621,7 +51621,7 @@
 					<Top>1553</Top>
 					<Left>77</Left>
 					<z>0</z>
-					<Width>801</Width>
+					<Width>706</Width>
 					<Height>395</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -51687,7 +51687,7 @@
 					<Top>48</Top>
 					<Left>76</Left>
 					<z>0</z>
-					<Width>438</Width>
+					<Width>390</Width>
 					<Height>288</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -51715,7 +51715,7 @@
 					<Top>844</Top>
 					<Left>3131</Left>
 					<z>0</z>
-					<Width>715</Width>
+					<Width>621</Width>
 					<Height>824</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -51765,7 +51765,7 @@
 					<Top>1409</Top>
 					<Left>2146</Left>
 					<z>0</z>
-					<Width>667</Width>
+					<Width>585</Width>
 					<Height>551</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -51807,7 +51807,7 @@
 					<Top>9</Top>
 					<Left>3848</Left>
 					<z>0</z>
-					<Width>663</Width>
+					<Width>565</Width>
 					<Height>434</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -51882,7 +51882,7 @@
 					<Top>234</Top>
 					<Left>1963</Left>
 					<z>0</z>
-					<Width>570</Width>
+					<Width>507</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -51920,7 +51920,7 @@
 					<Top>431</Top>
 					<Left>3839</Left>
 					<z>0</z>
-					<Width>574</Width>
+					<Width>503</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -51958,7 +51958,7 @@
 					<Top>813</Top>
 					<Left>4273</Left>
 					<z>0</z>
-					<Width>620</Width>
+					<Width>549</Width>
 					<Height>473</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -51996,7 +51996,7 @@
 					<Top>490</Top>
 					<Left>1923</Left>
 					<z>0</z>
-					<Width>662</Width>
+					<Width>582</Width>
 					<Height>473</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52034,7 +52034,7 @@
 					<Top>1358</Top>
 					<Left>4250</Left>
 					<z>0</z>
-					<Width>693</Width>
+					<Width>605</Width>
 					<Height>707</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52072,7 +52072,7 @@
 					<Top>2564</Top>
 					<Left>3240</Left>
 					<z>0</z>
-					<Width>618</Width>
+					<Width>538</Width>
 					<Height>590</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52109,7 +52109,7 @@
 					<Top>18</Top>
 					<Left>2893</Left>
 					<z>0</z>
-					<Width>679</Width>
+					<Width>594</Width>
 					<Height>512</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52148,7 +52148,7 @@
 					<Top>2556</Top>
 					<Left>1196</Left>
 					<z>0</z>
-					<Width>738</Width>
+					<Width>652</Width>
 					<Height>707</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52185,7 +52185,7 @@
 					<Top>2385</Top>
 					<Left>4217</Left>
 					<z>0</z>
-					<Width>720</Width>
+					<Width>624</Width>
 					<Height>668</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52224,7 +52224,7 @@
 					<Top>3110</Top>
 					<Left>4231</Left>
 					<z>0</z>
-					<Width>611</Width>
+					<Width>546</Width>
 					<Height>278</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52261,7 +52261,7 @@
 					<Top>2345</Top>
 					<Left>154</Left>
 					<z>0</z>
-					<Width>640</Width>
+					<Width>561</Width>
 					<Height>356</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52299,7 +52299,7 @@
 					<Top>2883</Top>
 					<Left>233</Left>
 					<z>0</z>
-					<Width>622</Width>
+					<Width>551</Width>
 					<Height>395</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52337,7 +52337,7 @@
 					<Top>2258</Top>
 					<Left>3249</Left>
 					<z>0</z>
-					<Width>720</Width>
+					<Width>627</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52374,7 +52374,7 @@
 					<Top>1715</Top>
 					<Left>3100</Left>
 					<z>0</z>
-					<Width>774</Width>
+					<Width>680</Width>
 					<Height>473</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52414,7 +52414,7 @@
 					<Top>566</Top>
 					<Left>2977</Left>
 					<z>0</z>
-					<Width>585</Width>
+					<Width>521</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52452,7 +52452,7 @@
 					<Top>1078</Top>
 					<Left>2186</Left>
 					<z>0</z>
-					<Width>574</Width>
+					<Width>505</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52490,7 +52490,7 @@
 					<Top>2107</Top>
 					<Left>4248</Left>
 					<z>0</z>
-					<Width>668</Width>
+					<Width>580</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52527,7 +52527,7 @@
 					<Top>3006</Top>
 					<Left>2257</Left>
 					<z>0</z>
-					<Width>681</Width>
+					<Width>594</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52564,7 +52564,7 @@
 					<Top>2572</Top>
 					<Left>2275</Left>
 					<z>0</z>
-					<Width>667</Width>
+					<Width>582</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52602,7 +52602,7 @@
 					<Top>2243</Top>
 					<Left>2284</Left>
 					<z>0</z>
-					<Width>649</Width>
+					<Width>565</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -52644,15 +52644,15 @@
 					<WorkSpaceShape2>
 						<Id>{AC7E9335-6EDA-449D-AAED-066D0C76A911}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>808</NamePositionX>
+					<NamePositionX>769</NamePositionX>
 					<NamePositionY>1676</NamePositionY>
 					<Points>
 						<Point>
-							<x>718</x>
+							<x>641</x>
 							<y>1368</y>
 						</Point>
 						<Point>
-							<x>749</x>
+							<x>672</x>
 							<y>1368</y>
 						</Point>
 						<Point>
@@ -52687,7 +52687,7 @@
 					<WorkSpaceShape2>
 						<Id>{B39C63FA-F416-40B5-A65C-C3CFA65D7A85}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>933</NamePositionX>
+					<NamePositionX>891</NamePositionX>
 					<NamePositionY>1149</NamePositionY>
 					<Points>
 						<Point>
@@ -52699,11 +52699,11 @@
 							<y>1175</y>
 						</Point>
 						<Point>
-							<x>805</x>
+							<x>720</x>
 							<y>970</y>
 						</Point>
 						<Point>
-							<x>774</x>
+							<x>689</x>
 							<y>970</y>
 						</Point>
 					</Points>
@@ -52730,23 +52730,23 @@
 					<WorkSpaceShape2>
 						<Id>{AC7E9335-6EDA-449D-AAED-066D0C76A911}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>905</NamePositionX>
+					<NamePositionX>860</NamePositionX>
 					<NamePositionY>2021</NamePositionY>
 					<Points>
 						<Point>
-							<x>1578</x>
+							<x>1529</x>
 							<y>2131</y>
 						</Point>
 						<Point>
-							<x>1578</x>
+							<x>1529</x>
 							<y>2100</y>
 						</Point>
 						<Point>
-							<x>1560</x>
+							<x>1518</x>
 							<y>2087</y>
 						</Point>
 						<Point>
-							<x>1560</x>
+							<x>1518</x>
 							<y>2056</y>
 						</Point>
 					</Points>
@@ -52773,23 +52773,23 @@
 					<WorkSpaceShape2>
 						<Id>{AC7E9335-6EDA-449D-AAED-066D0C76A911}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1214</NamePositionX>
+					<NamePositionX>1175</NamePositionX>
 					<NamePositionY>771</NamePositionY>
 					<Points>
 						<Point>
-							<x>1368</x>
+							<x>1333</x>
 							<y>844</y>
 						</Point>
 						<Point>
-							<x>1368</x>
+							<x>1333</x>
 							<y>875</y>
 						</Point>
 						<Point>
-							<x>1560</x>
+							<x>1518</x>
 							<y>850</y>
 						</Point>
 						<Point>
-							<x>1560</x>
+							<x>1518</x>
 							<y>881</y>
 						</Point>
 					</Points>
@@ -52816,7 +52816,7 @@
 					<WorkSpaceShape2>
 						<Id>{59E89AFD-49F1-4495-990C-7D1E0CFAE754}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>996</NamePositionX>
+					<NamePositionX>949</NamePositionX>
 					<NamePositionY>1748</NamePositionY>
 					<Points>
 						<Point>
@@ -52828,11 +52828,11 @@
 							<y>1762</y>
 						</Point>
 						<Point>
-							<x>909</x>
+							<x>814</x>
 							<y>1750</y>
 						</Point>
 						<Point>
-							<x>878</x>
+							<x>783</x>
 							<y>1750</y>
 						</Point>
 					</Points>
@@ -52859,23 +52859,23 @@
 					<WorkSpaceShape2>
 						<Id>{59E89AFD-49F1-4495-990C-7D1E0CFAE754}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>37</NamePositionX>
+					<NamePositionX>0</NamePositionX>
 					<NamePositionY>1950</NamePositionY>
 					<Points>
 						<Point>
-							<x>474</x>
+							<x>424</x>
 							<y>2055</y>
 						</Point>
 						<Point>
-							<x>474</x>
+							<x>424</x>
 							<y>2024</y>
 						</Point>
 						<Point>
-							<x>478</x>
+							<x>430</x>
 							<y>1979</y>
 						</Point>
 						<Point>
-							<x>478</x>
+							<x>430</x>
 							<y>1948</y>
 						</Point>
 					</Points>
@@ -52902,7 +52902,7 @@
 					<WorkSpaceShape2>
 						<Id>{AC7E9335-6EDA-449D-AAED-066D0C76A911}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2298</NamePositionX>
+					<NamePositionX>2256</NamePositionX>
 					<NamePositionY>1278</NamePositionY>
 					<Points>
 						<Point>
@@ -52914,11 +52914,11 @@
 							<y>1174</y>
 						</Point>
 						<Point>
-							<x>1914</x>
+							<x>1830</x>
 							<y>1468</y>
 						</Point>
 						<Point>
-							<x>1883</x>
+							<x>1799</x>
 							<y>1468</y>
 						</Point>
 					</Points>
@@ -52945,23 +52945,23 @@
 					<WorkSpaceShape2>
 						<Id>{20F41636-8E77-4350-B677-A3F3B4033D9D}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1906</NamePositionX>
+					<NamePositionX>1844</NamePositionX>
 					<NamePositionY>326</NamePositionY>
 					<Points>
 						<Point>
-							<x>1962</x>
+							<x>1864</x>
 							<y>2263</y>
 						</Point>
 						<Point>
-							<x>1993</x>
+							<x>1895</x>
 							<y>2263</y>
 						</Point>
 						<Point>
-							<x>2368</x>
+							<x>2341</x>
 							<y>1991</y>
 						</Point>
 						<Point>
-							<x>2368</x>
+							<x>2341</x>
 							<y>1960</y>
 						</Point>
 					</Points>
@@ -52988,7 +52988,7 @@
 					<WorkSpaceShape2>
 						<Id>{AEC00992-F1D6-40FD-A416-4E20794894AD}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2177</NamePositionX>
+					<NamePositionX>2161</NamePositionX>
 					<NamePositionY>128</NamePositionY>
 					<Points>
 						<Point>
@@ -53000,11 +53000,11 @@
 							<y>179</y>
 						</Point>
 						<Point>
-							<x>2248</x>
+							<x>2216</x>
 							<y>203</y>
 						</Point>
 						<Point>
-							<x>2248</x>
+							<x>2216</x>
 							<y>234</y>
 						</Point>
 					</Points>
@@ -53031,23 +53031,23 @@
 					<WorkSpaceShape2>
 						<Id>{AEC00992-F1D6-40FD-A416-4E20794894AD}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2791</NamePositionX>
-					<NamePositionY>292</NamePositionY>
+					<NamePositionX>2718</NamePositionX>
+					<NamePositionY>291</NamePositionY>
 					<Points>
 						<Point>
-							<x>3369</x>
+							<x>3286</x>
 							<y>844</y>
 						</Point>
 						<Point>
-							<x>3369</x>
+							<x>3286</x>
 							<y>813</y>
 						</Point>
 						<Point>
-							<x>2564</x>
+							<x>2501</x>
 							<y>334</y>
 						</Point>
 						<Point>
-							<x>2533</x>
+							<x>2470</x>
 							<y>334</y>
 						</Point>
 					</Points>
@@ -53074,23 +53074,23 @@
 					<WorkSpaceShape2>
 						<Id>{2FC2ED24-E0E3-4F64-8362-24385DBDDE02}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3952</NamePositionX>
+					<NamePositionX>3909</NamePositionX>
 					<NamePositionY>397</NamePositionY>
 					<Points>
 						<Point>
-							<x>4180</x>
+							<x>4130</x>
 							<y>443</y>
 						</Point>
 						<Point>
-							<x>4180</x>
+							<x>4130</x>
 							<y>474</y>
 						</Point>
 						<Point>
-							<x>4126</x>
+							<x>4090</x>
 							<y>400</y>
 						</Point>
 						<Point>
-							<x>4126</x>
+							<x>4090</x>
 							<y>431</y>
 						</Point>
 					</Points>
@@ -53117,24 +53117,24 @@
 					<WorkSpaceShape2>
 						<Id>{2FC2ED24-E0E3-4F64-8362-24385DBDDE02}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3850</NamePositionX>
-					<NamePositionY>798</NamePositionY>
+					<NamePositionX>3552</NamePositionX>
+					<NamePositionY>634</NamePositionY>
 					<Points>
 						<Point>
-							<x>3846</x>
-							<y>1009</y>
+							<x>3597</x>
+							<y>844</y>
 						</Point>
 						<Point>
-							<x>3877</x>
-							<y>1009</y>
+							<x>3597</x>
+							<y>813</y>
 						</Point>
 						<Point>
-							<x>4126</x>
-							<y>662</y>
+							<x>3808</x>
+							<y>531</y>
 						</Point>
 						<Point>
-							<x>4126</x>
-							<y>631</y>
+							<x>3839</x>
+							<y>531</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -53160,8 +53160,8 @@
 					<WorkSpaceShape2>
 						<Id>{4CBD4377-C7EA-48BE-B997-5A0FA6DD1269}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3774</NamePositionX>
-					<NamePositionY>1102</NamePositionY>
+					<NamePositionX>3726</NamePositionX>
+					<NamePositionY>1040</NamePositionY>
 					<Points>
 						<Point>
 							<x>4273</x>
@@ -53172,12 +53172,12 @@
 							<y>971</y>
 						</Point>
 						<Point>
-							<x>3877</x>
-							<y>1174</y>
+							<x>3783</x>
+							<y>1050</y>
 						</Point>
 						<Point>
-							<x>3846</x>
-							<y>1174</y>
+							<x>3752</x>
+							<y>1050</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -53203,15 +53203,15 @@
 					<WorkSpaceShape2>
 						<Id>{4CBD4377-C7EA-48BE-B997-5A0FA6DD1269}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2857</NamePositionX>
+					<NamePositionX>2816</NamePositionX>
 					<NamePositionY>1533</NamePositionY>
 					<Points>
 						<Point>
-							<x>2813</x>
+							<x>2731</x>
 							<y>1684</y>
 						</Point>
 						<Point>
-							<x>2844</x>
+							<x>2762</x>
 							<y>1684</y>
 						</Point>
 						<Point>
@@ -53246,15 +53246,15 @@
 					<WorkSpaceShape2>
 						<Id>{4CBD4377-C7EA-48BE-B997-5A0FA6DD1269}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2756</NamePositionX>
+					<NamePositionX>2716</NamePositionX>
 					<NamePositionY>807</NamePositionY>
 					<Points>
 						<Point>
-							<x>2585</x>
+							<x>2505</x>
 							<y>726</y>
 						</Point>
 						<Point>
-							<x>2616</x>
+							<x>2536</x>
 							<y>726</y>
 						</Point>
 						<Point>
@@ -53289,8 +53289,8 @@
 					<WorkSpaceShape2>
 						<Id>{4CBD4377-C7EA-48BE-B997-5A0FA6DD1269}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3951</NamePositionX>
-					<NamePositionY>1173</NamePositionY>
+					<NamePositionX>3904</NamePositionX>
+					<NamePositionY>1132</NamePositionY>
 					<Points>
 						<Point>
 							<x>4273</x>
@@ -53301,12 +53301,12 @@
 							<y>1128</y>
 						</Point>
 						<Point>
-							<x>3877</x>
-							<y>1338</y>
+							<x>3783</x>
+							<y>1256</y>
 						</Point>
 						<Point>
-							<x>3846</x>
-							<y>1338</y>
+							<x>3752</x>
+							<y>1256</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -53332,16 +53332,16 @@
 					<WorkSpaceShape2>
 						<Id>{4A5E8539-F34B-475F-9928-AC82793EEF59}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3948</NamePositionX>
-					<NamePositionY>1547</NamePositionY>
+					<NamePositionX>3901</NamePositionX>
+					<NamePositionY>1527</NamePositionY>
 					<Points>
 						<Point>
-							<x>3846</x>
-							<y>1503</y>
+							<x>3752</x>
+							<y>1462</y>
 						</Point>
 						<Point>
-							<x>3877</x>
-							<y>1503</y>
+							<x>3783</x>
+							<y>1462</y>
 						</Point>
 						<Point>
 							<x>4219</x>
@@ -53375,23 +53375,23 @@
 					<WorkSpaceShape2>
 						<Id>{4CBD4377-C7EA-48BE-B997-5A0FA6DD1269}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3455</NamePositionX>
+					<NamePositionX>3407</NamePositionX>
 					<NamePositionY>2056</NamePositionY>
 					<Points>
 						<Point>
-							<x>3549</x>
+							<x>3509</x>
 							<y>2564</y>
 						</Point>
 						<Point>
-							<x>3549</x>
+							<x>3509</x>
 							<y>2533</y>
 						</Point>
 						<Point>
-							<x>3560</x>
+							<x>3504</x>
 							<y>1699</y>
 						</Point>
 						<Point>
-							<x>3560</x>
+							<x>3504</x>
 							<y>1668</y>
 						</Point>
 					</Points>
@@ -53418,23 +53418,23 @@
 					<WorkSpaceShape2>
 						<Id>{4CBD4377-C7EA-48BE-B997-5A0FA6DD1269}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3377</NamePositionX>
+					<NamePositionX>3265</NamePositionX>
 					<NamePositionY>627</NamePositionY>
 					<Points>
 						<Point>
-							<x>3346</x>
+							<x>3289</x>
 							<y>530</y>
 						</Point>
 						<Point>
-							<x>3346</x>
+							<x>3289</x>
 							<y>561</y>
 						</Point>
 						<Point>
-							<x>3608</x>
+							<x>3442</x>
 							<y>813</y>
 						</Point>
 						<Point>
-							<x>3608</x>
+							<x>3442</x>
 							<y>844</y>
 						</Point>
 					</Points>
@@ -53461,7 +53461,7 @@
 					<WorkSpaceShape2>
 						<Id>{250FCCBF-4717-47E0-B8E7-A12BB03889F9}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1740</NamePositionX>
+					<NamePositionX>1719</NamePositionX>
 					<NamePositionY>2090</NamePositionY>
 					<Points>
 						<Point>
@@ -53473,11 +53473,11 @@
 							<y>1776</y>
 						</Point>
 						<Point>
-							<x>1565</x>
+							<x>1522</x>
 							<y>2525</y>
 						</Point>
 						<Point>
-							<x>1565</x>
+							<x>1522</x>
 							<y>2556</y>
 						</Point>
 					</Points>
@@ -53504,23 +53504,23 @@
 					<WorkSpaceShape2>
 						<Id>{DB59DF18-64A7-4185-8765-7238517341C0}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3980</NamePositionX>
-					<NamePositionY>1966</NamePositionY>
+					<NamePositionX>3926</NamePositionX>
+					<NamePositionY>1967</NamePositionY>
 					<Points>
 						<Point>
-							<x>3703</x>
+							<x>3628</x>
 							<y>1668</y>
 						</Point>
 						<Point>
-							<x>3703</x>
+							<x>3628</x>
 							<y>1699</y>
 						</Point>
 						<Point>
-							<x>4457</x>
+							<x>4425</x>
 							<y>2354</y>
 						</Point>
 						<Point>
-							<x>4457</x>
+							<x>4425</x>
 							<y>2385</y>
 						</Point>
 					</Points>
@@ -53547,23 +53547,23 @@
 					<WorkSpaceShape2>
 						<Id>{239C6766-B0BC-4E1F-9833-C49206AF8D54}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>4457</NamePositionX>
+					<NamePositionX>4417</NamePositionX>
 					<NamePositionY>3022</NamePositionY>
 					<Points>
 						<Point>
-							<x>4577</x>
+							<x>4529</x>
 							<y>3053</y>
 						</Point>
 						<Point>
-							<x>4577</x>
+							<x>4529</x>
 							<y>3084</y>
 						</Point>
 						<Point>
-							<x>4536</x>
+							<x>4504</x>
 							<y>3079</y>
 						</Point>
 						<Point>
-							<x>4536</x>
+							<x>4504</x>
 							<y>3110</y>
 						</Point>
 					</Points>
@@ -53590,8 +53590,8 @@
 					<WorkSpaceShape2>
 						<Id>{6419EE86-CB44-41FA-9E2B-1C2555508A93}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1370</NamePositionX>
-					<NamePositionY>2027</NamePositionY>
+					<NamePositionX>1331</NamePositionX>
+					<NamePositionY>1968</NamePositionY>
 					<Points>
 						<Point>
 							<x>2146</x>
@@ -53602,12 +53602,12 @@
 							<y>1593</y>
 						</Point>
 						<Point>
-							<x>825</x>
-							<y>2582</y>
+							<x>746</x>
+							<y>2464</y>
 						</Point>
 						<Point>
-							<x>794</x>
-							<y>2582</y>
+							<x>715</x>
+							<y>2464</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -53633,8 +53633,8 @@
 					<WorkSpaceShape2>
 						<Id>{6419EE86-CB44-41FA-9E2B-1C2555508A93}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>894</NamePositionX>
-					<NamePositionY>2303</NamePositionY>
+					<NamePositionX>855</NamePositionX>
+					<NamePositionY>2362</NamePositionY>
 					<Points>
 						<Point>
 							<x>1194</x>
@@ -53645,12 +53645,12 @@
 							<y>2263</y>
 						</Point>
 						<Point>
-							<x>825</x>
-							<y>2464</y>
+							<x>746</x>
+							<y>2582</y>
 						</Point>
 						<Point>
-							<x>794</x>
-							<y>2464</y>
+							<x>715</x>
+							<y>2582</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -53676,7 +53676,7 @@
 					<WorkSpaceShape2>
 						<Id>{5FEF0B42-3911-4B97-A654-2AD1A67125FC}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1893</NamePositionX>
+					<NamePositionX>1858</NamePositionX>
 					<NamePositionY>2182</NamePositionY>
 					<Points>
 						<Point>
@@ -53688,11 +53688,11 @@
 							<y>1338</y>
 						</Point>
 						<Point>
-							<x>886</x>
+							<x>815</x>
 							<y>3146</y>
 						</Point>
 						<Point>
-							<x>855</x>
+							<x>784</x>
 							<y>3146</y>
 						</Point>
 					</Points>
@@ -53719,7 +53719,7 @@
 					<WorkSpaceShape2>
 						<Id>{5FEF0B42-3911-4B97-A654-2AD1A67125FC}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>925</NamePositionX>
+					<NamePositionX>889</NamePositionX>
 					<NamePositionY>2644</NamePositionY>
 					<Points>
 						<Point>
@@ -53731,11 +53731,11 @@
 							<y>2394</y>
 						</Point>
 						<Point>
-							<x>886</x>
+							<x>815</x>
 							<y>3015</y>
 						</Point>
 						<Point>
-							<x>855</x>
+							<x>784</x>
 							<y>3015</y>
 						</Point>
 					</Points>
@@ -53762,23 +53762,23 @@
 					<WorkSpaceShape2>
 						<Id>{D8AD2B3F-B9E4-412E-992F-3B4D116FDEE1}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3216</NamePositionX>
-					<NamePositionY>1632</NamePositionY>
+					<NamePositionX>3191</NamePositionX>
+					<NamePositionY>1631</NamePositionY>
 					<Points>
 						<Point>
-							<x>3274</x>
+							<x>3255</x>
 							<y>1668</y>
 						</Point>
 						<Point>
-							<x>3274</x>
+							<x>3255</x>
 							<y>1699</y>
 						</Point>
 						<Point>
-							<x>3358</x>
+							<x>3327</x>
 							<y>1684</y>
 						</Point>
 						<Point>
-							<x>3358</x>
+							<x>3327</x>
 							<y>1715</y>
 						</Point>
 					</Points>
@@ -53805,23 +53805,23 @@
 					<WorkSpaceShape2>
 						<Id>{D8AD2B3F-B9E4-412E-992F-3B4D116FDEE1}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3448</NamePositionX>
+					<NamePositionX>3401</NamePositionX>
 					<NamePositionY>2163</NamePositionY>
 					<Points>
 						<Point>
-							<x>3609</x>
+							<x>3562</x>
 							<y>2258</y>
 						</Point>
 						<Point>
-							<x>3609</x>
+							<x>3562</x>
 							<y>2227</y>
 						</Point>
 						<Point>
-							<x>3487</x>
+							<x>3440</x>
 							<y>2219</y>
 						</Point>
 						<Point>
-							<x>3487</x>
+							<x>3440</x>
 							<y>2188</y>
 						</Point>
 					</Points>
@@ -53848,23 +53848,23 @@
 					<WorkSpaceShape2>
 						<Id>{D8AD2B3F-B9E4-412E-992F-3B4D116FDEE1}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3267</NamePositionX>
+					<NamePositionX>3222</NamePositionX>
 					<NamePositionY>1063</NamePositionY>
 					<Points>
 						<Point>
-							<x>3119</x>
+							<x>3091</x>
 							<y>530</y>
 						</Point>
 						<Point>
-							<x>3119</x>
+							<x>3091</x>
 							<y>561</y>
 						</Point>
 						<Point>
-							<x>3616</x>
+							<x>3553</x>
 							<y>1684</y>
 						</Point>
 						<Point>
-							<x>3616</x>
+							<x>3553</x>
 							<y>1715</y>
 						</Point>
 					</Points>
@@ -53891,15 +53891,15 @@
 					<WorkSpaceShape2>
 						<Id>{D8AD2B3F-B9E4-412E-992F-3B4D116FDEE1}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2431</NamePositionX>
+					<NamePositionX>2382</NamePositionX>
 					<NamePositionY>2113</NamePositionY>
 					<Points>
 						<Point>
-							<x>1962</x>
+							<x>1864</x>
 							<y>2394</y>
 						</Point>
 						<Point>
-							<x>1993</x>
+							<x>1895</x>
 							<y>2394</y>
 						</Point>
 						<Point>
@@ -53977,23 +53977,23 @@
 					<WorkSpaceShape2>
 						<Id>{B4891794-493A-4F6A-9EA2-76CEE5D5773B}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3995</NamePositionX>
+					<NamePositionX>3940</NamePositionX>
 					<NamePositionY>937</NamePositionY>
 					<Points>
 						<Point>
-							<x>4596</x>
+							<x>4552</x>
 							<y>1358</y>
 						</Point>
 						<Point>
-							<x>4596</x>
+							<x>4552</x>
 							<y>1327</y>
 						</Point>
 						<Point>
-							<x>3593</x>
+							<x>3529</x>
 							<y>666</y>
 						</Point>
 						<Point>
-							<x>3562</x>
+							<x>3498</x>
 							<y>666</y>
 						</Point>
 					</Points>
@@ -54020,23 +54020,23 @@
 					<WorkSpaceShape2>
 						<Id>{5AEA4D3B-818E-4916-AD78-C310205D8563}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2263</NamePositionX>
+					<NamePositionX>2226</NamePositionX>
 					<NamePositionY>960</NamePositionY>
 					<Points>
 						<Point>
-							<x>2254</x>
+							<x>2214</x>
 							<y>963</y>
 						</Point>
 						<Point>
-							<x>2254</x>
+							<x>2214</x>
 							<y>994</y>
 						</Point>
 						<Point>
-							<x>2473</x>
+							<x>2438</x>
 							<y>1047</y>
 						</Point>
 						<Point>
-							<x>2473</x>
+							<x>2438</x>
 							<y>1078</y>
 						</Point>
 					</Points>
@@ -54063,23 +54063,23 @@
 					<WorkSpaceShape2>
 						<Id>{5AEA4D3B-818E-4916-AD78-C310205D8563}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2377</NamePositionX>
+					<NamePositionX>2338</NamePositionX>
 					<NamePositionY>1284</NamePositionY>
 					<Points>
 						<Point>
-							<x>2480</x>
+							<x>2438</x>
 							<y>1409</y>
 						</Point>
 						<Point>
-							<x>2480</x>
+							<x>2438</x>
 							<y>1378</y>
 						</Point>
 						<Point>
-							<x>2473</x>
+							<x>2438</x>
 							<y>1309</y>
 						</Point>
 						<Point>
-							<x>2473</x>
+							<x>2438</x>
 							<y>1278</y>
 						</Point>
 					</Points>
@@ -54106,23 +54106,23 @@
 					<WorkSpaceShape2>
 						<Id>{DB59DF18-64A7-4185-8765-7238517341C0}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>4540</NamePositionX>
+					<NamePositionX>4486</NamePositionX>
 					<NamePositionY>2286</NamePositionY>
 					<Points>
 						<Point>
-							<x>4582</x>
+							<x>4538</x>
 							<y>2307</y>
 						</Point>
 						<Point>
-							<x>4582</x>
+							<x>4538</x>
 							<y>2338</y>
 						</Point>
 						<Point>
-							<x>4697</x>
+							<x>4633</x>
 							<y>2354</y>
 						</Point>
 						<Point>
-							<x>4697</x>
+							<x>4633</x>
 							<y>2385</y>
 						</Point>
 					</Points>
@@ -54149,23 +54149,23 @@
 					<WorkSpaceShape2>
 						<Id>{F05FB345-CEFF-4712-8B69-BDC2C97D93A7}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2499</NamePositionX>
+					<NamePositionX>2451</NamePositionX>
 					<NamePositionY>2206</NamePositionY>
 					<Points>
 						<Point>
-							<x>2591</x>
+							<x>2536</x>
 							<y>1960</y>
 						</Point>
 						<Point>
-							<x>2591</x>
+							<x>2536</x>
 							<y>1991</y>
 						</Point>
 						<Point>
-							<x>2608</x>
+							<x>2566</x>
 							<y>2541</y>
 						</Point>
 						<Point>
-							<x>2608</x>
+							<x>2566</x>
 							<y>2572</y>
 						</Point>
 					</Points>
@@ -54192,23 +54192,23 @@
 					<WorkSpaceShape2>
 						<Id>{F05FB345-CEFF-4712-8B69-BDC2C97D93A7}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2503</NamePositionX>
+					<NamePositionX>2460</NamePositionX>
 					<NamePositionY>2829</NamePositionY>
 					<Points>
 						<Point>
-							<x>2598</x>
+							<x>2554</x>
 							<y>3006</y>
 						</Point>
 						<Point>
-							<x>2598</x>
+							<x>2554</x>
 							<y>2975</y>
 						</Point>
 						<Point>
-							<x>2608</x>
+							<x>2566</x>
 							<y>2803</y>
 						</Point>
 						<Point>
-							<x>2608</x>
+							<x>2566</x>
 							<y>2772</y>
 						</Point>
 					</Points>
@@ -54235,23 +54235,23 @@
 					<WorkSpaceShape2>
 						<Id>{4CBD4377-C7EA-48BE-B997-5A0FA6DD1269}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3090</NamePositionX>
+					<NamePositionX>3029</NamePositionX>
 					<NamePositionY>1961</NamePositionY>
 					<Points>
 						<Point>
-							<x>2933</x>
+							<x>2849</x>
 							<y>2343</y>
 						</Point>
 						<Point>
-							<x>2964</x>
+							<x>2880</x>
 							<y>2343</y>
 						</Point>
 						<Point>
-							<x>3417</x>
+							<x>3379</x>
 							<y>1699</y>
 						</Point>
 						<Point>
-							<x>3417</x>
+							<x>3379</x>
 							<y>1668</y>
 						</Point>
 					</Points>
@@ -54278,8 +54278,8 @@
 					<WorkSpaceShape2>
 						<Id>{B39C63FA-F416-40B5-A65C-C3CFA65D7A85}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1734</NamePositionX>
-					<NamePositionY>458</NamePositionY>
+					<NamePositionX>1691</NamePositionX>
+					<NamePositionY>457</NamePositionY>
 					<Points>
 						<Point>
 							<x>2893</x>
@@ -54290,11 +54290,11 @@
 							<y>274</y>
 						</Point>
 						<Point>
-							<x>805</x>
+							<x>720</x>
 							<y>761</y>
 						</Point>
 						<Point>
-							<x>774</x>
+							<x>689</x>
 							<y>761</y>
 						</Point>
 					</Points>
@@ -55847,8 +55847,8 @@
 					<Top>61</Top>
 					<Left>1006</Left>
 					<z>0</z>
-					<Width>583</Width>
-					<Height>512</Height>
+					<Width>515</Width>
+					<Height>551</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -55886,8 +55886,8 @@
 					<Top>743</Top>
 					<Left>1274</Left>
 					<z>0</z>
-					<Width>615</Width>
-					<Height>434</Height>
+					<Width>543</Width>
+					<Height>473</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -55928,7 +55928,7 @@
 					<Top>79</Top>
 					<Left>2404</Left>
 					<z>0</z>
-					<Width>679</Width>
+					<Width>594</Width>
 					<Height>512</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -55968,7 +55968,7 @@
 					<Top>1369</Top>
 					<Left>1213</Left>
 					<z>0</z>
-					<Width>717</Width>
+					<Width>625</Width>
 					<Height>1370</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -56005,7 +56005,7 @@
 					<Top>1469</Top>
 					<Left>64</Left>
 					<z>0</z>
-					<Width>753</Width>
+					<Width>655</Width>
 					<Height>1370</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -56042,7 +56042,7 @@
 					<Top>490</Top>
 					<Left>50</Left>
 					<z>0</z>
-					<Width>715</Width>
+					<Width>621</Width>
 					<Height>824</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -56079,7 +56079,7 @@
 					<Top>22</Top>
 					<Left>33</Left>
 					<z>0</z>
-					<Width>438</Width>
+					<Width>390</Width>
 					<Height>288</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -56135,7 +56135,7 @@
 					<Top>2077</Top>
 					<Left>2040</Left>
 					<z>0</z>
-					<Width>736</Width>
+					<Width>643</Width>
 					<Height>1097</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -56172,8 +56172,8 @@
 					<Top>474</Top>
 					<Left>1757</Left>
 					<z>0</z>
-					<Width>200</Width>
-					<Height>300</Height>
+					<Width>588</Width>
+					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -56209,8 +56209,8 @@
 					<Top>860</Top>
 					<Left>1774</Left>
 					<z>0</z>
-					<Width>200</Width>
-					<Height>300</Height>
+					<Width>576</Width>
+					<Height>239</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -56247,8 +56247,8 @@
 					<Top>2925</Top>
 					<Left>1120</Left>
 					<z>0</z>
-					<Width>200</Width>
-					<Height>300</Height>
+					<Width>580</Width>
+					<Height>395</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -56282,8 +56282,8 @@
 					<Top>3594</Top>
 					<Left>2125</Left>
 					<z>0</z>
-					<Width>200</Width>
-					<Height>300</Height>
+					<Width>641</Width>
+					<Height>239</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -56319,8 +56319,8 @@
 					<Top>3625</Top>
 					<Left>1645</Left>
 					<z>0</z>
-					<Width>200</Width>
-					<Height>300</Height>
+					<Width>649</Width>
+					<Height>278</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -56356,8 +56356,8 @@
 					<Top>4078</Top>
 					<Left>1956</Left>
 					<z>0</z>
-					<Width>200</Width>
-					<Height>300</Height>
+					<Width>605</Width>
+					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -56394,8 +56394,8 @@
 					<Top>2114</Top>
 					<Left>1066</Left>
 					<z>0</z>
-					<Width>200</Width>
-					<Height>300</Height>
+					<Width>498</Width>
+					<Height>395</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -56434,23 +56434,23 @@
 					<WorkSpaceShape2>
 						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1171</NamePositionX>
-					<NamePositionY>627</NamePositionY>
+					<NamePositionX>1136</NamePositionX>
+					<NamePositionY>646</NamePositionY>
 					<Points>
 						<Point>
-							<x>1298</x>
-							<y>573</y>
+							<x>1264</x>
+							<y>612</y>
 						</Point>
 						<Point>
-							<x>1298</x>
-							<y>604</y>
+							<x>1264</x>
+							<y>643</y>
 						</Point>
 						<Point>
-							<x>1582</x>
+							<x>1546</x>
 							<y>712</y>
 						</Point>
 						<Point>
-							<x>1582</x>
+							<x>1546</x>
 							<y>743</y>
 						</Point>
 					</Points>
@@ -56477,24 +56477,24 @@
 					<WorkSpaceShape2>
 						<Id>{6796A1AC-54A7-4EF0-8B39-1A30C6393C40}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1803</NamePositionX>
-					<NamePositionY>283</NamePositionY>
+					<NamePositionX>1769</NamePositionX>
+					<NamePositionY>270</NamePositionY>
 					<Points>
 						<Point>
 							<x>2404</x>
-							<y>335</y>
+							<y>284</y>
 						</Point>
 						<Point>
 							<x>2373</x>
-							<y>335</y>
+							<y>284</y>
 						</Point>
 						<Point>
-							<x>1620</x>
-							<y>402</y>
+							<x>1552</x>
+							<y>428</y>
 						</Point>
 						<Point>
-							<x>1589</x>
-							<y>402</y>
+							<x>1521</x>
+							<y>428</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -56520,24 +56520,24 @@
 					<WorkSpaceShape2>
 						<Id>{6796A1AC-54A7-4EF0-8B39-1A30C6393C40}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1790</NamePositionX>
-					<NamePositionY>112</NamePositionY>
+					<NamePositionX>1756</NamePositionX>
+					<NamePositionY>106</NamePositionY>
 					<Points>
 						<Point>
 							<x>2404</x>
-							<y>207</y>
+							<y>181</y>
 						</Point>
 						<Point>
 							<x>2373</x>
-							<y>207</y>
+							<y>181</y>
 						</Point>
 						<Point>
-							<x>1620</x>
-							<y>232</y>
+							<x>1552</x>
+							<y>245</y>
 						</Point>
 						<Point>
-							<x>1589</x>
-							<y>232</y>
+							<x>1521</x>
+							<y>245</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -56563,24 +56563,24 @@
 					<WorkSpaceShape2>
 						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2047</NamePositionX>
-					<NamePositionY>651</NamePositionY>
+					<NamePositionX>2011</NamePositionX>
+					<NamePositionY>623</NamePositionY>
 					<Points>
 						<Point>
 							<x>2404</x>
-							<y>463</y>
+							<y>386</y>
 						</Point>
 						<Point>
 							<x>2373</x>
-							<y>463</y>
+							<y>386</y>
 						</Point>
 						<Point>
-							<x>1920</x>
-							<y>960</y>
+							<x>1848</x>
+							<y>980</y>
 						</Point>
 						<Point>
-							<x>1889</x>
-							<y>960</y>
+							<x>1817</x>
+							<y>980</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -56606,24 +56606,24 @@
 					<WorkSpaceShape2>
 						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1426</NamePositionX>
-					<NamePositionY>1213</NamePositionY>
+					<NamePositionX>1391</NamePositionX>
+					<NamePositionY>1233</NamePositionY>
 					<Points>
 						<Point>
-							<x>1572</x>
+							<x>1526</x>
 							<y>1369</y>
 						</Point>
 						<Point>
-							<x>1572</x>
+							<x>1526</x>
 							<y>1338</y>
 						</Point>
 						<Point>
-							<x>1479</x>
-							<y>1208</y>
+							<x>1455</x>
+							<y>1247</y>
 						</Point>
 						<Point>
-							<x>1479</x>
-							<y>1177</y>
+							<x>1455</x>
+							<y>1216</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -56649,24 +56649,24 @@
 					<WorkSpaceShape2>
 						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>558</NamePositionX>
-					<NamePositionY>1400</NamePositionY>
+					<NamePositionX>534</NamePositionX>
+					<NamePositionY>1413</NamePositionY>
 					<Points>
 						<Point>
-							<x>440</x>
+							<x>392</x>
 							<y>1469</y>
 						</Point>
 						<Point>
-							<x>440</x>
+							<x>392</x>
 							<y>1438</y>
 						</Point>
 						<Point>
 							<x>1243</x>
-							<y>1032</y>
+							<y>1058</y>
 						</Point>
 						<Point>
 							<x>1274</x>
-							<y>1032</y>
+							<y>1058</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -56692,24 +56692,24 @@
 					<WorkSpaceShape2>
 						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>733</NamePositionX>
-					<NamePositionY>894</NamePositionY>
+					<NamePositionX>686</NamePositionX>
+					<NamePositionY>901</NamePositionY>
 					<Points>
 						<Point>
-							<x>765</x>
+							<x>671</x>
 							<y>902</y>
 						</Point>
 						<Point>
-							<x>796</x>
+							<x>702</x>
 							<y>902</y>
 						</Point>
 						<Point>
 							<x>1243</x>
-							<y>888</y>
+							<y>901</y>
 						</Point>
 						<Point>
 							<x>1274</x>
-							<y>888</y>
+							<y>901</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -56735,24 +56735,24 @@
 					<WorkSpaceShape2>
 						<Id>{CCD12E07-139E-4901-BAFD-9ADFDE1519B5}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1946</NamePositionX>
-					<NamePositionY>1567</NamePositionY>
+					<NamePositionX>1899</NamePositionX>
+					<NamePositionY>1586</NamePositionY>
 					<Points>
 						<Point>
-							<x>2408</x>
+							<x>2362</x>
 							<y>2077</y>
 						</Point>
 						<Point>
-							<x>2408</x>
+							<x>2362</x>
 							<y>2046</y>
 						</Point>
 						<Point>
-							<x>1684</x>
-							<y>1208</y>
+							<x>1636</x>
+							<y>1247</y>
 						</Point>
 						<Point>
-							<x>1684</x>
-							<y>1177</y>
+							<x>1636</x>
+							<y>1216</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -56778,9 +56778,26 @@
 					<WorkSpaceShape2>
 						<Id>{6BD3EC9E-9161-43A7-9CC8-BF917732C85C}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>0</NamePositionX>
-					<NamePositionY>0</NamePositionY>
-					<Points/>
+					<NamePositionX>1909</NamePositionX>
+					<NamePositionY>707</NamePositionY>
+					<Points>
+						<Point>
+							<x>2051</x>
+							<y>674</y>
+						</Point>
+						<Point>
+							<x>2051</x>
+							<y>705</y>
+						</Point>
+						<Point>
+							<x>1966</x>
+							<y>829</y>
+						</Point>
+						<Point>
+							<x>1966</x>
+							<y>860</y>
+						</Point>
+					</Points>
 				</WorkSpaceLinePERRelationPG83>
 				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
 					<Id>{72FAA735-FAC5-45AB-8411-5C528C10E18F}</Id>
@@ -56804,9 +56821,26 @@
 					<WorkSpaceShape2>
 						<Id>{6BD3EC9E-9161-43A7-9CC8-BF917732C85C}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>0</NamePositionX>
-					<NamePositionY>0</NamePositionY>
-					<Points/>
+					<NamePositionX>2165</NamePositionX>
+					<NamePositionY>599</NamePositionY>
+					<Points>
+						<Point>
+							<x>2404</x>
+							<y>489</y>
+						</Point>
+						<Point>
+							<x>2373</x>
+							<y>489</y>
+						</Point>
+						<Point>
+							<x>2158</x>
+							<y>829</y>
+						</Point>
+						<Point>
+							<x>2158</x>
+							<y>860</y>
+						</Point>
+					</Points>
 				</WorkSpaceLinePERRelationPG83>
 				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
 					<Id>{68BBC17B-ACF2-49A7-AB06-3268EE036518}</Id>
@@ -56830,9 +56864,26 @@
 					<WorkSpaceShape2>
 						<Id>{09E75D8D-3EF2-4E45-8D07-71989F160740}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>0</NamePositionX>
-					<NamePositionY>0</NamePositionY>
-					<Points/>
+					<NamePositionX>2302</NamePositionX>
+					<NamePositionY>3896</NamePositionY>
+					<Points>
+						<Point>
+							<x>2359</x>
+							<y>4078</y>
+						</Point>
+						<Point>
+							<x>2359</x>
+							<y>4047</y>
+						</Point>
+						<Point>
+							<x>2446</x>
+							<y>3864</y>
+						</Point>
+						<Point>
+							<x>2446</x>
+							<y>3833</y>
+						</Point>
+					</Points>
 				</WorkSpaceLinePERRelationPG83>
 				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
 					<Id>{05CD6A16-B647-4F3A-A443-61700B6F8C1F}</Id>
@@ -56856,9 +56907,26 @@
 					<WorkSpaceShape2>
 						<Id>{693FEC5B-B9B2-45A7-A9DD-003094FA3D93}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>0</NamePositionX>
-					<NamePositionY>0</NamePositionY>
-					<Points/>
+					<NamePositionX>1964</NamePositionX>
+					<NamePositionY>3931</NamePositionY>
+					<Points>
+						<Point>
+							<x>2158</x>
+							<y>4078</y>
+						</Point>
+						<Point>
+							<x>2158</x>
+							<y>4047</y>
+						</Point>
+						<Point>
+							<x>1970</x>
+							<y>3934</y>
+						</Point>
+						<Point>
+							<x>1970</x>
+							<y>3903</y>
+						</Point>
+					</Points>
 				</WorkSpaceLinePERRelationPG83>
 			</LineList>
 			<Page>
@@ -59877,11 +59945,11 @@
 					<FontStyle>0</FontStyle>
 					<FormatLocked>0</FormatLocked>
 					<FontHeight>-28</FontHeight>
-					<Top>66</Top>
-					<Left>876</Left>
+					<Top>36</Top>
+					<Left>790</Left>
 					<z>0</z>
-					<Width>511</Width>
-					<Height>278</Height>
+					<Width>523</Width>
+					<Height>356</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -59990,8 +60058,8 @@
 					<FontStyle>0</FontStyle>
 					<FormatLocked>0</FormatLocked>
 					<FontHeight>-28</FontHeight>
-					<Top>395</Top>
-					<Left>896</Left>
+					<Top>422</Top>
+					<Left>1096</Left>
 					<z>0</z>
 					<Width>557</Width>
 					<Height>434</Height>
@@ -60180,8 +60248,8 @@
 					<FontStyle>0</FontStyle>
 					<FormatLocked>0</FormatLocked>
 					<FontHeight>-28</FontHeight>
-					<Top>1334</Top>
-					<Left>1703</Left>
+					<Top>1429</Top>
+					<Left>1656</Left>
 					<z>0</z>
 					<Width>571</Width>
 					<Height>473</Height>
@@ -60333,8 +60401,8 @@
 					<FontStyle>0</FontStyle>
 					<FormatLocked>0</FormatLocked>
 					<FontHeight>-28</FontHeight>
-					<Top>1626</Top>
-					<Left>2424</Left>
+					<Top>1677</Top>
+					<Left>2480</Left>
 					<z>0</z>
 					<Width>549</Width>
 					<Height>629</Height>
@@ -60409,8 +60477,8 @@
 					<FontStyle>0</FontStyle>
 					<FormatLocked>0</FormatLocked>
 					<FontHeight>-28</FontHeight>
-					<Top>1630</Top>
-					<Left>1686</Left>
+					<Top>2034</Top>
+					<Left>1508</Left>
 					<z>0</z>
 					<Width>553</Width>
 					<Height>746</Height>
@@ -60509,8 +60577,8 @@
 					<FontStyle>0</FontStyle>
 					<FormatLocked>0</FormatLocked>
 					<FontHeight>-28</FontHeight>
-					<Top>898</Top>
-					<Left>912</Left>
+					<Top>890</Top>
+					<Left>933</Left>
 					<z>0</z>
 					<Width>576</Width>
 					<Height>239</Height>
@@ -60556,8 +60624,8 @@
 					<WorkSpaceShape2>
 						<Id>{E4A06DD7-5B3B-4519-A47D-1A3E75178691}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2007</NamePositionX>
-					<NamePositionY>106</NamePositionY>
+					<NamePositionX>1970</NamePositionX>
+					<NamePositionY>104</NamePositionY>
 					<Points>
 						<Point>
 							<x>2827</x>
@@ -60568,12 +60636,12 @@
 							<y>173</y>
 						</Point>
 						<Point>
-							<x>1418</x>
-							<y>159</y>
+							<x>1344</x>
+							<y>155</y>
 						</Point>
 						<Point>
-							<x>1387</x>
-							<y>159</y>
+							<x>1313</x>
+							<y>155</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -60599,8 +60667,8 @@
 					<WorkSpaceShape2>
 						<Id>{E4A06DD7-5B3B-4519-A47D-1A3E75178691}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1549</NamePositionX>
-					<NamePositionY>356</NamePositionY>
+					<NamePositionX>1513</NamePositionX>
+					<NamePositionY>367</NamePositionY>
 					<Points>
 						<Point>
 							<x>1912</x>
@@ -60611,12 +60679,12 @@
 							<y>580</y>
 						</Point>
 						<Point>
-							<x>1418</x>
-							<y>251</y>
+							<x>1344</x>
+							<y>273</y>
 						</Point>
 						<Point>
-							<x>1387</x>
-							<y>251</y>
+							<x>1313</x>
+							<y>273</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -60642,8 +60710,8 @@
 					<WorkSpaceShape2>
 						<Id>{4F082A2B-B9C4-41CC-9461-AFAA2B04156E}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1097</NamePositionX>
-					<NamePositionY>961</NamePositionY>
+					<NamePositionX>1128</NamePositionX>
+					<NamePositionY>974</NamePositionY>
 					<Points>
 						<Point>
 							<x>1220</x>
@@ -60654,12 +60722,12 @@
 							<y>1181</y>
 						</Point>
 						<Point>
-							<x>1174</x>
-							<y>860</y>
+							<x>1235</x>
+							<y>887</y>
 						</Point>
 						<Point>
-							<x>1174</x>
-							<y>829</y>
+							<x>1235</x>
+							<y>856</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -60685,8 +60753,8 @@
 					<WorkSpaceShape2>
 						<Id>{4F082A2B-B9C4-41CC-9461-AFAA2B04156E}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>509</NamePositionX>
-					<NamePositionY>792</NamePositionY>
+					<NamePositionX>609</NamePositionX>
+					<NamePositionY>805</NamePositionY>
 					<Points>
 						<Point>
 							<x>354</x>
@@ -60697,12 +60765,12 @@
 							<y>1019</y>
 						</Point>
 						<Point>
-							<x>865</x>
-							<y>684</y>
+							<x>1065</x>
+							<y>711</y>
 						</Point>
 						<Point>
-							<x>896</x>
-							<y>684</y>
+							<x>1096</x>
+							<y>711</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -60728,24 +60796,24 @@
 					<WorkSpaceShape2>
 						<Id>{AE07A161-6CC7-4A19-A377-935F9839DADB}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2569</NamePositionX>
-					<NamePositionY>1114</NamePositionY>
+					<NamePositionX>2545</NamePositionX>
+					<NamePositionY>1201</NamePositionY>
 					<Points>
 						<Point>
 							<x>3063</x>
-							<y>778</y>
+							<y>857</y>
 						</Point>
 						<Point>
 							<x>3032</x>
-							<y>778</y>
+							<y>857</y>
 						</Point>
 						<Point>
-							<x>2305</x>
-							<y>1570</y>
+							<x>2258</x>
+							<y>1666</y>
 						</Point>
 						<Point>
-							<x>2274</x>
-							<y>1570</y>
+							<x>2227</x>
+							<y>1666</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -60771,8 +60839,8 @@
 					<WorkSpaceShape2>
 						<Id>{AE07A161-6CC7-4A19-A377-935F9839DADB}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2623</NamePositionX>
-					<NamePositionY>1394</NamePositionY>
+					<NamePositionX>2599</NamePositionX>
+					<NamePositionY>1442</NamePositionY>
 					<Points>
 						<Point>
 							<x>3172</x>
@@ -60783,12 +60851,12 @@
 							<y>1220</y>
 						</Point>
 						<Point>
-							<x>2305</x>
-							<y>1689</y>
+							<x>2258</x>
+							<y>1784</y>
 						</Point>
 						<Point>
-							<x>2274</x>
-							<y>1689</y>
+							<x>2227</x>
+							<y>1784</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -60814,8 +60882,8 @@
 					<WorkSpaceShape2>
 						<Id>{AE07A161-6CC7-4A19-A377-935F9839DADB}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2252</NamePositionX>
-					<NamePositionY>1369</NamePositionY>
+					<NamePositionX>2228</NamePositionX>
+					<NamePositionY>1416</NamePositionY>
 					<Points>
 						<Point>
 							<x>2429</x>
@@ -60826,12 +60894,12 @@
 							<y>1405</y>
 						</Point>
 						<Point>
-							<x>2305</x>
-							<y>1452</y>
+							<x>2258</x>
+							<y>1547</y>
 						</Point>
 						<Point>
-							<x>2274</x>
-							<y>1452</y>
+							<x>2227</x>
+							<y>1547</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -60857,8 +60925,8 @@
 					<WorkSpaceShape2>
 						<Id>{DEB8EF1F-2B2A-4109-A2C2-C7C123D25DBE}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2989</NamePositionX>
-					<NamePositionY>1943</NamePositionY>
+					<NamePositionX>3017</NamePositionX>
+					<NamePositionY>1969</NamePositionY>
 					<Points>
 						<Point>
 							<x>3205</x>
@@ -60869,12 +60937,12 @@
 							<y>2066</y>
 						</Point>
 						<Point>
-							<x>3004</x>
-							<y>1940</y>
+							<x>3060</x>
+							<y>1992</y>
 						</Point>
 						<Point>
-							<x>2973</x>
-							<y>1940</y>
+							<x>3029</x>
+							<y>1992</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -60900,8 +60968,8 @@
 					<WorkSpaceShape2>
 						<Id>{DEB8EF1F-2B2A-4109-A2C2-C7C123D25DBE}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2865</NamePositionX>
-					<NamePositionY>1439</NamePositionY>
+					<NamePositionX>2893</NamePositionX>
+					<NamePositionY>1465</NamePositionY>
 					<Points>
 						<Point>
 							<x>3172</x>
@@ -60912,12 +60980,12 @@
 							<y>1403</y>
 						</Point>
 						<Point>
-							<x>2790</x>
-							<y>1595</y>
+							<x>2846</x>
+							<y>1646</y>
 						</Point>
 						<Point>
-							<x>2790</x>
-							<y>1626</y>
+							<x>2846</x>
+							<y>1677</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -60943,24 +61011,24 @@
 					<WorkSpaceShape2>
 						<Id>{DEB8EF1F-2B2A-4109-A2C2-C7C123D25DBE}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2720</NamePositionX>
-					<NamePositionY>1186</NamePositionY>
+					<NamePositionX>2909</NamePositionX>
+					<NamePositionY>1286</NamePositionY>
 					<Points>
 						<Point>
-							<x>3063</x>
-							<y>897</y>
+							<x>3354</x>
+							<y>1015</y>
 						</Point>
 						<Point>
-							<x>3032</x>
-							<y>897</y>
+							<x>3354</x>
+							<y>1046</y>
 						</Point>
 						<Point>
-							<x>2607</x>
-							<y>1595</y>
+							<x>2663</x>
+							<y>1646</y>
 						</Point>
 						<Point>
-							<x>2607</x>
-							<y>1626</y>
+							<x>2663</x>
+							<y>1677</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -60986,8 +61054,8 @@
 					<WorkSpaceShape2>
 						<Id>{19690621-37DA-415C-AF74-70E150519D54}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1764</NamePositionX>
-					<NamePositionY>1138</NamePositionY>
+					<NamePositionX>1765</NamePositionX>
+					<NamePositionY>1157</NamePositionY>
 					<Points>
 						<Point>
 							<x>666</x>
@@ -60999,11 +61067,11 @@
 						</Point>
 						<Point>
 							<x>3032</x>
-							<y>660</y>
+							<y>700</y>
 						</Point>
 						<Point>
 							<x>3063</x>
-							<y>660</y>
+							<y>700</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -61029,16 +61097,16 @@
 					<WorkSpaceShape2>
 						<Id>{C6D5E47E-7659-4A57-ABE0-C6E6C317025E}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>651</NamePositionX>
-					<NamePositionY>541</NamePositionY>
+					<NamePositionX>751</NamePositionX>
+					<NamePositionY>555</NamePositionY>
 					<Points>
 						<Point>
-							<x>896</x>
-							<y>540</y>
+							<x>1096</x>
+							<y>567</y>
 						</Point>
 						<Point>
-							<x>865</x>
-							<y>540</y>
+							<x>1065</x>
+							<y>567</y>
 						</Point>
 						<Point>
 							<x>637</x>
@@ -61072,16 +61140,16 @@
 					<WorkSpaceShape2>
 						<Id>{C8016D6A-B783-41C7-8F8E-6126AD3C7E82}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1015</NamePositionX>
-					<NamePositionY>1088</NamePositionY>
+					<NamePositionX>1185</NamePositionX>
+					<NamePositionY>1101</NamePositionY>
 					<Points>
 						<Point>
-							<x>1035</x>
-							<y>829</y>
+							<x>1374</x>
+							<y>856</y>
 						</Point>
 						<Point>
-							<x>1035</x>
-							<y>860</y>
+							<x>1374</x>
+							<y>887</y>
 						</Point>
 						<Point>
 							<x>1196</x>
@@ -61115,8 +61183,8 @@
 					<WorkSpaceShape2>
 						<Id>{92DECA91-4DE9-4E41-A357-E3069F1DE138}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1481</NamePositionX>
-					<NamePositionY>1083</NamePositionY>
+					<NamePositionX>1491</NamePositionX>
+					<NamePositionY>1089</NamePositionY>
 					<Points>
 						<Point>
 							<x>1673</x>
@@ -61127,12 +61195,12 @@
 							<y>1228</y>
 						</Point>
 						<Point>
-							<x>1519</x>
-							<y>1057</y>
+							<x>1540</x>
+							<y>1069</y>
 						</Point>
 						<Point>
-							<x>1488</x>
-							<y>1057</y>
+							<x>1509</x>
+							<y>1069</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -61158,24 +61226,24 @@
 					<WorkSpaceShape2>
 						<Id>{92DECA91-4DE9-4E41-A357-E3069F1DE138}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1157</NamePositionX>
-					<NamePositionY>807</NamePositionY>
+					<NamePositionX>1427</NamePositionX>
+					<NamePositionY>862</NamePositionY>
 					<Points>
 						<Point>
-							<x>1314</x>
-							<y>829</y>
+							<x>1514</x>
+							<y>856</y>
 						</Point>
 						<Point>
-							<x>1314</x>
-							<y>860</y>
+							<x>1514</x>
+							<y>887</y>
 						</Point>
 						<Point>
-							<x>1200</x>
-							<y>867</y>
+							<x>1540</x>
+							<y>950</y>
 						</Point>
 						<Point>
-							<x>1200</x>
-							<y>898</y>
+							<x>1509</x>
+							<y>950</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -61201,8 +61269,8 @@
 					<WorkSpaceShape2>
 						<Id>{92DECA91-4DE9-4E41-A357-E3069F1DE138}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2058</NamePositionX>
-					<NamePositionY>601</NamePositionY>
+					<NamePositionX>2068</NamePositionX>
+					<NamePositionY>617</NamePositionY>
 					<Points>
 						<Point>
 							<x>2827</x>
@@ -61213,12 +61281,12 @@
 							<y>343</y>
 						</Point>
 						<Point>
-							<x>1519</x>
-							<y>978</y>
+							<x>1540</x>
+							<y>1010</y>
 						</Point>
 						<Point>
-							<x>1488</x>
-							<y>978</y>
+							<x>1509</x>
+							<y>1010</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -62401,7 +62469,7 @@
 			<Company>FH Technikum Wien</Company>
 			<Version>3.0</Version>
 			<CreatedDate>2009-04-17T11:15:21.000+02:00</CreatedDate>
-			<ModifiedDate>2014-10-07T16:31:09.401+02:00</ModifiedDate>
+			<ModifiedDate>2014-10-10T14:49:43.717+02:00</ModifiedDate>
 			<Project>FH-Complete 3.0</Project>
 			<Description>&lt;?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?&gt;
 </Description>
@@ -128007,7 +128075,7 @@ ALTER TABLE tbl_mitarbeiter ALTER COLUMN personalnummer DROP NOT NULL;</Comments
 					<AfterScript></AfterScript>
 					<Notes></Notes>
 					<Comments></Comments>
-					<DataTypeParam1>20</DataTypeParam1>
+					<DataTypeParam1></DataTypeParam1>
 					<DataTypeParam2></DataTypeParam2>
 					<KeepForeignKey>0</KeepForeignKey>
 					<DefaultValue></DefaultValue>
@@ -128024,7 +128092,7 @@ ALTER TABLE tbl_mitarbeiter ALTER COLUMN personalnummer DROP NOT NULL;</Comments
 					<DictType/>
 					<Domain/>
 					<DataType>
-						<Id>{ECB8F02F-B683-4252-8508-ED9D064C9AF3}</Id>
+						<Id>{F6C99ABF-677B-48C6-920E-F375B79C336D}</Id>
 					</DataType>
 					<UserDataType/>
 					<IndexItems/>
@@ -159088,6 +159156,47 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
 					<ArrDims></ArrDims>
 					<IsArray>0</IsArray>
 				</PERAttributePG83>
+				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
+					<Id>{BF76F7D1-5D84-41E6-8E83-90296F5DA7F4}</Id>
+					<Name>ext_id</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{9E04B7F3-E9F5-49F6-A810-9A2A9D2B563B}</HistoryID>
+					<GlobalOrder>0</GlobalOrder>
+					<RNOffset>0</RNOffset>
+					<RNLength>0</RNLength>
+					<IgnoreNC>0</IgnoreNC>
+					<GenerateCode>1</GenerateCode>
+					<BeforeScript></BeforeScript>
+					<AfterScript></AfterScript>
+					<Notes></Notes>
+					<Comments></Comments>
+					<DataTypeParam1></DataTypeParam1>
+					<DataTypeParam2></DataTypeParam2>
+					<KeepForeignKey>0</KeepForeignKey>
+					<DefaultValue></DefaultValue>
+					<NotNull>0</NotNull>
+					<Migrated>0</Migrated>
+					<Caption>ext_id</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<FKForeignKeys/>
+					<DictType/>
+					<Domain/>
+					<DataType>
+						<Id>{F6C99ABF-677B-48C6-920E-F375B79C336D}</Id>
+					</DataType>
+					<UserDataType/>
+					<IndexItems/>
+					<Default/>
+					<CheckConstraints/>
+					<KeyConstraint/>
+					<ArrDims></ArrDims>
+					<IsArray>0</IsArray>
+				</PERAttributePG83>
 			</Attributes>
 			<Keys>
 				<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
@@ -159613,6 +159722,47 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
 					<ArrDims></ArrDims>
 					<IsArray>0</IsArray>
 				</PERAttributePG83>
+				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
+					<Id>{CE54FBA6-5951-4C08-8F8B-96D650D32C66}</Id>
+					<Name>ext_id</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{008ACA44-AE1E-47D2-B843-3A7A0C87E702}</HistoryID>
+					<GlobalOrder>0</GlobalOrder>
+					<RNOffset>0</RNOffset>
+					<RNLength>0</RNLength>
+					<IgnoreNC>0</IgnoreNC>
+					<GenerateCode>1</GenerateCode>
+					<BeforeScript></BeforeScript>
+					<AfterScript></AfterScript>
+					<Notes></Notes>
+					<Comments></Comments>
+					<DataTypeParam1></DataTypeParam1>
+					<DataTypeParam2></DataTypeParam2>
+					<KeepForeignKey>0</KeepForeignKey>
+					<DefaultValue></DefaultValue>
+					<NotNull>0</NotNull>
+					<Migrated>0</Migrated>
+					<Caption>ext_id</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<FKForeignKeys/>
+					<DictType/>
+					<Domain/>
+					<DataType>
+						<Id>{F6C99ABF-677B-48C6-920E-F375B79C336D}</Id>
+					</DataType>
+					<UserDataType/>
+					<IndexItems/>
+					<Default/>
+					<CheckConstraints/>
+					<KeyConstraint/>
+					<ArrDims></ArrDims>
+					<IsArray>0</IsArray>
+				</PERAttributePG83>
 			</Attributes>
 			<Keys>
 				<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
@@ -178989,6 +179139,88 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
 					<ArrDims></ArrDims>
 					<IsArray>0</IsArray>
 				</PERAttributePG83>
+				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
+					<Id>{F3D79AE1-2746-4B99-AC23-4CA8F2C01D31}</Id>
+					<Name>ext_id</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{90E93D7C-7511-43A5-9D10-CE9B24B6CE78}</HistoryID>
+					<GlobalOrder>0</GlobalOrder>
+					<RNOffset>0</RNOffset>
+					<RNLength>0</RNLength>
+					<IgnoreNC>0</IgnoreNC>
+					<GenerateCode>1</GenerateCode>
+					<BeforeScript></BeforeScript>
+					<AfterScript></AfterScript>
+					<Notes></Notes>
+					<Comments></Comments>
+					<DataTypeParam1></DataTypeParam1>
+					<DataTypeParam2></DataTypeParam2>
+					<KeepForeignKey>0</KeepForeignKey>
+					<DefaultValue></DefaultValue>
+					<NotNull>0</NotNull>
+					<Migrated>0</Migrated>
+					<Caption>ext_id</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<FKForeignKeys/>
+					<DictType/>
+					<Domain/>
+					<DataType>
+						<Id>{F6C99ABF-677B-48C6-920E-F375B79C336D}</Id>
+					</DataType>
+					<UserDataType/>
+					<IndexItems/>
+					<Default/>
+					<CheckConstraints/>
+					<KeyConstraint/>
+					<ArrDims></ArrDims>
+					<IsArray>0</IsArray>
+				</PERAttributePG83>
+				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
+					<Id>{5C854D9F-1261-4863-85F7-A7968E1785F2}</Id>
+					<Name>anmerkung</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{75D6B9D5-3F85-4BE5-B081-060338273074}</HistoryID>
+					<GlobalOrder>0</GlobalOrder>
+					<RNOffset>0</RNOffset>
+					<RNLength>0</RNLength>
+					<IgnoreNC>0</IgnoreNC>
+					<GenerateCode>1</GenerateCode>
+					<BeforeScript></BeforeScript>
+					<AfterScript></AfterScript>
+					<Notes></Notes>
+					<Comments></Comments>
+					<DataTypeParam1>256</DataTypeParam1>
+					<DataTypeParam2></DataTypeParam2>
+					<KeepForeignKey>0</KeepForeignKey>
+					<DefaultValue></DefaultValue>
+					<NotNull>0</NotNull>
+					<Migrated>0</Migrated>
+					<Caption>anmerkung</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<FKForeignKeys/>
+					<DictType/>
+					<Domain/>
+					<DataType>
+						<Id>{ECB8F02F-B683-4252-8508-ED9D064C9AF3}</Id>
+					</DataType>
+					<UserDataType/>
+					<IndexItems/>
+					<Default/>
+					<CheckConstraints/>
+					<KeyConstraint/>
+					<ArrDims></ArrDims>
+					<IsArray>0</IsArray>
+				</PERAttributePG83>
 			</Attributes>
 			<Keys>
 				<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
diff --git a/system/checksystem.php b/system/checksystem.php
index dccd8f97c..e1f8e05d6 100644
--- a/system/checksystem.php
+++ b/system/checksystem.php
@@ -1919,6 +1919,19 @@ if(!$result = @$db->db_query("SELECT wochenstunden FROM public.tbl_benutzerfunkt
 	else
 		echo ' public.tbl_benutzerfunktion: Spalte wochenstunden hinzugefuegt!<br>';
 }
+
+// Tabelle public.tbl_anwesenheit Spalte anmerkung
+if(!$result = @$db->db_query("SELECT anmerkung FROM campus.tbl_anwesenheit"))
+{
+	$qry = "ALTER TABLE campus.tbl_anwesenheit ADD COLUMN anmerkung varchar(256);
+			ALTER TABLE campus.tbl_anwesenheit ADD COLUMN ext_id bigint;";
+
+	if(!$db->db_query($qry))
+		echo '<strong>campus.tbl_anwesenheit '.$db->db_last_error().'</strong><br>';
+	else
+		echo ' campus.tbl_anwesenheit: Spalte anmerkung, ext_id hinzugefuegt!<br>';
+}
+
 echo '<br><br><br>';
 
 $tabellen=array(
@@ -1945,7 +1958,7 @@ $tabellen=array(
 	"bis.tbl_zweck"  => array("zweck_code","kurzbz","bezeichnung"),
     "bis.tbl_zgvdoktor" => array("zgvdoktor_code", "zgvdoktor_bez", "zgvdoktor_kurzbz"),
 	"campus.tbl_abgabe"  => array("abgabe_id","abgabedatei","abgabezeit","anmerkung"),
-	"campus.tbl_anwesenheit"  => array("anwesenheit_id","uid","einheiten","datum","anwesend","lehreinheit_id"),
+	"campus.tbl_anwesenheit"  => array("anwesenheit_id","uid","einheiten","datum","anwesend","lehreinheit_id","anmerkung","ext_id"),
 	"campus.tbl_beispiel"  => array("beispiel_id","uebung_id","nummer","bezeichnung","punkte","updateamum","updatevon","insertamum","insertvon"),
 	"campus.tbl_benutzerlvstudiensemester"  => array("uid","studiensemester_kurzbz","lehrveranstaltung_id"),
 	"campus.tbl_content"  => array("content_id","template_kurzbz","updatevon","updateamum","insertamum","insertvon","oe_kurzbz","menu_open","aktiv","beschreibung"),