From 95618ca4af7ba0964a55615d0f457baedc6fd441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 5 May 2014 13:30:04 +0000
Subject: [PATCH] =?UTF-8?q?Spalte=20Ort=5Fkurzbz=20zu=20Tabelle=20campus.t?=
 =?UTF-8?q?bl=5Fpruefungstermin=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 system/FH-Complete.txp | 1139 ++++++++++++++++++++++++++++------------
 system/checksystem.php |  101 +++-
 2 files changed, 888 insertions(+), 352 deletions(-)

diff --git a/system/FH-Complete.txp b/system/FH-Complete.txp
index ba73e2598..4c585d36b 100644
--- a/system/FH-Complete.txp
+++ b/system/FH-Complete.txp
@@ -4337,6 +4337,7 @@
 						<Id>{AD7903A5-1112-4E34-A2C9-4F0631EE719B}</Id>
 						<Id>{D0D2FE0F-A345-4C16-A922-E076474AECC7}</Id>
 						<Id>{E07F2B23-9AA1-43B2-BFD1-C3970AB809C8}</Id>
+						<Id>{7B12477D-14A6-4A69-BC80-4415B62613E5}</Id>
 					</LineList>
 					<DisplayIndexes>0</DisplayIndexes>
 					<AlignInColumns>0</AlignInColumns>
@@ -10792,6 +10793,7 @@
 					<LineList>
 						<Id>{73BC4C3A-4E05-427F-B5A3-1532397C494B}</Id>
 						<Id>{DA10EC81-7DB3-4B98-9745-D473CDE94122}</Id>
+						<Id>{7B12477D-14A6-4A69-BC80-4415B62613E5}</Id>
 					</LineList>
 					<DisplayIndexes>0</DisplayIndexes>
 					<AlignInColumns>0</AlignInColumns>
@@ -16680,15 +16682,15 @@
 						<Id>{2124DEF7-967D-4AA0-AF82-421529126484}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>5848</NamePositionX>
-					<NamePositionY>1550</NamePositionY>
+					<NamePositionY>1556</NamePositionY>
 					<Points>
 						<Point>
 							<x>6395</x>
-							<y>1450</y>
+							<y>1463</y>
 						</Point>
 						<Point>
 							<x>6364</x>
-							<y>1450</y>
+							<y>1463</y>
 						</Point>
 						<Point>
 							<x>5332</x>
@@ -16723,15 +16725,15 @@
 						<Id>{DA94A477-BEF7-46E1-B584-D5D3B9ACA955}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>4822</NamePositionX>
-					<NamePositionY>1589</NamePositionY>
+					<NamePositionY>1602</NamePositionY>
 					<Points>
 						<Point>
 							<x>6395</x>
-							<y>1370</y>
+							<y>1397</y>
 						</Point>
 						<Point>
 							<x>6364</x>
-							<y>1370</y>
+							<y>1397</y>
 						</Point>
 						<Point>
 							<x>3280</x>
@@ -16809,15 +16811,15 @@
 						<Id>{1FF3EFC6-27CC-4914-A0B6-DD0A71BB0DC3}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>5788</NamePositionX>
-					<NamePositionY>1530</NamePositionY>
+					<NamePositionY>1540</NamePositionY>
 					<Points>
 						<Point>
 							<x>6395</x>
-							<y>1410</y>
+							<y>1430</y>
 						</Point>
 						<Point>
 							<x>6364</x>
-							<y>1410</y>
+							<y>1430</y>
 						</Point>
 						<Point>
 							<x>5212</x>
@@ -28264,15 +28266,15 @@
 						<Id>{947D9CF2-7AF8-466A-B181-4F41CAF0B75D}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>3706</NamePositionX>
-					<NamePositionY>2434</NamePositionY>
+					<NamePositionY>2437</NamePositionY>
 					<Points>
 						<Point>
 							<x>6395</x>
-							<y>1490</y>
+							<y>1497</y>
 						</Point>
 						<Point>
 							<x>6364</x>
-							<y>1490</y>
+							<y>1497</y>
 						</Point>
 						<Point>
 							<x>1247</x>
@@ -32041,15 +32043,15 @@
 						<Id>{D69635A5-03A9-42FC-8E80-920CCD7E3FA1}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>3103</NamePositionX>
-					<NamePositionY>862</NamePositionY>
+					<NamePositionY>845</NamePositionY>
 					<Points>
 						<Point>
 							<x>3138</x>
-							<y>968</y>
+							<y>935</y>
 						</Point>
 						<Point>
 							<x>3169</x>
-							<y>968</y>
+							<y>935</y>
 						</Point>
 						<Point>
 							<x>3237</x>
@@ -32147,6 +32149,49 @@
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
+				<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
+					<Id>{7B12477D-14A6-4A69-BC80-4415B62613E5}</Id>
+					<Name>fk_pruefungstermin_ort_ort_kurzbz</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{15426813-ABC1-4592-8343-06A8D61C3254}</HistoryID>
+					<GlobalOrder>0</GlobalOrder>
+					<ParentBaseID>{6FB61500-8D20-4ECA-850A-AC1F5A4B33B7}</ParentBaseID>
+					<PenWidth>1</PenWidth>
+					<PenColor>0</PenColor>
+					<BrushColor>15780518</BrushColor>
+					<FontCharset>238</FontCharset>
+					<FontColor>0</FontColor>
+					<FontName>Arial</FontName>
+					<FontStyle>0</FontStyle>
+					<FormatLocked>0</FormatLocked>
+					<FontHeight>-28</FontHeight>
+					<WorkSpaceShape1>
+						<Id>{8D6F100B-1ACE-40C8-91D8-D968D1844E87}</Id>
+					</WorkSpaceShape1>
+					<WorkSpaceShape2>
+						<Id>{F5E9D871-64D0-46BF-AC85-9B1D92A84E34}</Id>
+					</WorkSpaceShape2>
+					<NamePositionX>4667</NamePositionX>
+					<NamePositionY>1122</NamePositionY>
+					<Points>
+						<Point>
+							<x>6395</x>
+							<y>1363</y>
+						</Point>
+						<Point>
+							<x>6364</x>
+							<y>1363</y>
+						</Point>
+						<Point>
+							<x>3169</x>
+							<y>1001</y>
+						</Point>
+						<Point>
+							<x>3138</x>
+							<y>1001</y>
+						</Point>
+					</Points>
+				</WorkSpaceLinePERRelationPG83>
 			</LineList>
 			<Page>
 				<WorkSpacePagePG83 ObjectType="1511" CSAOName="WorkSpacePagePG83">
@@ -34432,7 +34477,7 @@
 					<Left>9895</Left>
 					<z>0</z>
 					<Width>589</Width>
-					<Height>473</Height>
+					<Height>512</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -34984,7 +35029,7 @@
 						<Id>{003CB043-E645-44CB-A1E7-B2DAB7CD0513}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>5894</NamePositionX>
-					<NamePositionY>744</NamePositionY>
+					<NamePositionY>687</NamePositionY>
 					<Points>
 						<Point>
 							<x>2271</x>
@@ -34996,11 +35041,11 @@
 						</Point>
 						<Point>
 							<x>9430</x>
-							<y>464</y>
+							<y>350</y>
 						</Point>
 						<Point>
 							<x>9461</x>
-							<y>464</y>
+							<y>350</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -35327,8 +35372,8 @@
 					<WorkSpaceShape2>
 						<Id>{02818E50-653A-4992-BBE2-4140B5EA18A4}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>4057</NamePositionX>
-					<NamePositionY>898</NamePositionY>
+					<NamePositionX>4146</NamePositionX>
+					<NamePositionY>918</NamePositionY>
 					<Points>
 						<Point>
 							<x>1200</x>
@@ -35856,7 +35901,7 @@
 						<Id>{C2303976-8004-4530-A9DC-543D000F94C9}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>7835</NamePositionX>
-					<NamePositionY>2913</NamePositionY>
+					<NamePositionY>2856</NamePositionY>
 					<Points>
 						<Point>
 							<x>8662</x>
@@ -35868,11 +35913,11 @@
 						</Point>
 						<Point>
 							<x>7198</x>
-							<y>3288</y>
+							<y>3173</y>
 						</Point>
 						<Point>
 							<x>7167</x>
-							<y>3288</y>
+							<y>3173</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -35941,24 +35986,24 @@
 					<WorkSpaceShape2>
 						<Id>{003CB043-E645-44CB-A1E7-B2DAB7CD0513}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>8227</NamePositionX>
-					<NamePositionY>2165</NamePositionY>
+					<NamePositionX>7956</NamePositionX>
+					<NamePositionY>1620</NamePositionY>
 					<Points>
 						<Point>
-							<x>7167</x>
-							<y>2945</y>
+							<x>6988</x>
+							<y>2260</y>
 						</Point>
 						<Point>
-							<x>7198</x>
-							<y>2945</y>
+							<x>6988</x>
+							<y>2229</y>
 						</Point>
 						<Point>
-							<x>9762</x>
-							<y>1408</y>
+							<x>9430</x>
+							<y>1034</y>
 						</Point>
 						<Point>
-							<x>9762</x>
-							<y>1377</y>
+							<x>9461</x>
+							<y>1034</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -36070,15 +36115,15 @@
 					<WorkSpaceShape2>
 						<Id>{CA4F7EAC-55C4-480E-B7C9-180DB66AC5B0}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>7688</NamePositionX>
+					<NamePositionX>7628</NamePositionX>
 					<NamePositionY>1473</NamePositionY>
 					<Points>
 						<Point>
-							<x>6928</x>
+							<x>6808</x>
 							<y>2260</y>
 						</Point>
 						<Point>
-							<x>6928</x>
+							<x>6808</x>
 							<y>2229</y>
 						</Point>
 						<Point>
@@ -36243,15 +36288,15 @@
 						<Id>{FFCA6168-3717-4994-BC3B-042505DD8EED}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>8058</NamePositionX>
-					<NamePositionY>2292</NamePositionY>
+					<NamePositionY>2349</NamePositionY>
 					<Points>
 						<Point>
 							<x>7167</x>
-							<y>2602</y>
+							<y>2717</y>
 						</Point>
 						<Point>
 							<x>7198</x>
-							<y>2602</y>
+							<y>2717</y>
 						</Point>
 						<Point>
 							<x>7521</x>
@@ -36285,24 +36330,24 @@
 					<WorkSpaceShape2>
 						<Id>{C9AFAFC7-19FB-4784-A406-4B4CDEABCD21}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>7729</NamePositionX>
-					<NamePositionY>1445</NamePositionY>
+					<NamePositionX>7580</NamePositionX>
+					<NamePositionY>1305</NamePositionY>
 					<Points>
 						<Point>
-							<x>6689</x>
+							<x>6629</x>
 							<y>2260</y>
 						</Point>
 						<Point>
-							<x>6689</x>
+							<x>6629</x>
 							<y>2229</y>
 						</Point>
 						<Point>
-							<x>8682</x>
-							<y>780</y>
+							<x>8444</x>
+							<y>500</y>
 						</Point>
 						<Point>
-							<x>8682</x>
-							<y>749</y>
+							<x>8475</x>
+							<y>500</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -36587,7 +36632,7 @@
 						<Id>{33986E60-971D-45AB-863E-3389A4534998}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>3387</NamePositionX>
-					<NamePositionY>2722</NamePositionY>
+					<NamePositionY>3052</NamePositionY>
 					<Points>
 						<Point>
 							<x>3415</x>
@@ -37115,7 +37160,7 @@
 						<Id>{C9AFAFC7-19FB-4784-A406-4B4CDEABCD21}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>8291</NamePositionX>
-					<NamePositionY>197</NamePositionY>
+					<NamePositionY>135</NamePositionY>
 					<Points>
 						<Point>
 							<x>8120</x>
@@ -37127,11 +37172,11 @@
 						</Point>
 						<Point>
 							<x>8444</x>
-							<y>376</y>
+							<y>252</y>
 						</Point>
 						<Point>
 							<x>8475</x>
-							<y>376</y>
+							<y>252</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -37329,7 +37374,7 @@
 					<WorkSpaceShape2>
 						<Id>{003CB043-E645-44CB-A1E7-B2DAB7CD0513}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>9496</NamePositionX>
+					<NamePositionX>9515</NamePositionX>
 					<NamePositionY>1357</NamePositionY>
 					<Points>
 						<Point>
@@ -37341,11 +37386,11 @@
 							<y>1426</y>
 						</Point>
 						<Point>
-							<x>9612</x>
+							<x>9649</x>
 							<y>1408</y>
 						</Point>
 						<Point>
-							<x>9612</x>
+							<x>9649</x>
 							<y>1377</y>
 						</Point>
 					</Points>
@@ -37373,7 +37418,7 @@
 						<Id>{003CB043-E645-44CB-A1E7-B2DAB7CD0513}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>7561</NamePositionX>
-					<NamePositionY>1948</NamePositionY>
+					<NamePositionY>1834</NamePositionY>
 					<Points>
 						<Point>
 							<x>3187</x>
@@ -37385,11 +37430,11 @@
 						</Point>
 						<Point>
 							<x>9430</x>
-							<y>920</y>
+							<y>692</y>
 						</Point>
 						<Point>
 							<x>9461</x>
-							<y>920</y>
+							<y>692</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -37501,7 +37546,7 @@
 					<WorkSpaceShape2>
 						<Id>{C9AFAFC7-19FB-4784-A406-4B4CDEABCD21}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>8912</NamePositionX>
+					<NamePositionX>8861</NamePositionX>
 					<NamePositionY>861</NamePositionY>
 					<Points>
 						<Point>
@@ -37513,11 +37558,11 @@
 							<y>1061</y>
 						</Point>
 						<Point>
-							<x>8888</x>
+							<x>8785</x>
 							<y>780</y>
 						</Point>
 						<Point>
-							<x>8888</x>
+							<x>8785</x>
 							<y>749</y>
 						</Point>
 					</Points>
@@ -38103,15 +38148,15 @@
 					<WorkSpaceShape2>
 						<Id>{CF52EB80-BE30-40A3-980C-8F262A0A0484}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>9489</NamePositionX>
+					<NamePositionX>9451</NamePositionX>
 					<NamePositionY>1590</NamePositionY>
 					<Points>
 						<Point>
-							<x>9913</x>
+							<x>9838</x>
 							<y>1377</y>
 						</Point>
 						<Point>
-							<x>9913</x>
+							<x>9838</x>
 							<y>1408</y>
 						</Point>
 						<Point>
@@ -38146,15 +38191,15 @@
 					<WorkSpaceShape2>
 						<Id>{4B8FF0F0-CE9E-4D02-B29F-73FEB38DB1AC}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>9565</NamePositionX>
-					<NamePositionY>2058</NamePositionY>
+					<NamePositionX>9546</NamePositionX>
+					<NamePositionY>2057</NamePositionY>
 					<Points>
 						<Point>
-							<x>10063</x>
+							<x>10026</x>
 							<y>1377</y>
 						</Point>
 						<Point>
-							<x>10063</x>
+							<x>10026</x>
 							<y>1408</y>
 						</Point>
 						<Point>
@@ -41411,8 +41456,8 @@
 					<Top>2545</Top>
 					<Left>5442</Left>
 					<z>0</z>
-					<Width>663</Width>
-					<Height>551</Height>
+					<Width>691</Width>
+					<Height>590</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -42714,7 +42759,7 @@
 					<WorkSpaceShape2>
 						<Id>{0E3E8E2E-1540-4DC6-8D2C-BC63D8314AD7}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>5743</NamePositionX>
+					<NamePositionX>5736</NamePositionX>
 					<NamePositionY>2421</NamePositionY>
 					<Points>
 						<Point>
@@ -42734,11 +42779,11 @@
 							<y>2481</y>
 						</Point>
 						<Point>
-							<x>5774</x>
+							<x>5788</x>
 							<y>2514</y>
 						</Point>
 						<Point>
-							<x>5774</x>
+							<x>5788</x>
 							<y>2545</y>
 						</Point>
 					</Points>
@@ -42954,7 +42999,7 @@
 					<Top>41</Top>
 					<Left>2795</Left>
 					<z>0</z>
-					<Width>724</Width>
+					<Width>645</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -42991,7 +43036,7 @@
 					<Top>309</Top>
 					<Left>2960</Left>
 					<z>0</z>
-					<Width>739</Width>
+					<Width>659</Width>
 					<Height>473</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43028,8 +43073,8 @@
 					<Top>1090</Top>
 					<Left>2047</Left>
 					<z>0</z>
-					<Width>799</Width>
-					<Height>1448</Height>
+					<Width>712</Width>
+					<Height>1565</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -43068,8 +43113,8 @@
 					<Top>542</Top>
 					<Left>62</Left>
 					<z>0</z>
-					<Width>827</Width>
-					<Height>980</Height>
+					<Width>736</Width>
+					<Height>1097</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -43107,7 +43152,7 @@
 					<Top>2326</Top>
 					<Left>2081</Left>
 					<z>0</z>
-					<Width>741</Width>
+					<Width>661</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43144,7 +43189,7 @@
 					<Top>2127</Top>
 					<Left>3114</Left>
 					<z>0</z>
-					<Width>791</Width>
+					<Width>705</Width>
 					<Height>707</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43182,7 +43227,7 @@
 					<Top>1964</Top>
 					<Left>4124</Left>
 					<z>0</z>
-					<Width>861</Width>
+					<Width>766</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43219,7 +43264,7 @@
 					<Top>2228</Top>
 					<Left>4099</Left>
 					<z>0</z>
-					<Width>861</Width>
+					<Width>766</Width>
 					<Height>512</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43257,7 +43302,7 @@
 					<Top>758</Top>
 					<Left>1155</Left>
 					<z>0</z>
-					<Width>697</Width>
+					<Width>623</Width>
 					<Height>902</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43298,7 +43343,7 @@
 					<Top>392</Top>
 					<Left>2076</Left>
 					<z>0</z>
-					<Width>666</Width>
+					<Width>594</Width>
 					<Height>551</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43336,7 +43381,7 @@
 					<Top>2200</Top>
 					<Left>92</Left>
 					<z>0</z>
-					<Width>618</Width>
+					<Width>551</Width>
 					<Height>356</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43373,7 +43418,7 @@
 					<Top>1037</Top>
 					<Left>5233</Left>
 					<z>0</z>
-					<Width>708</Width>
+					<Width>631</Width>
 					<Height>356</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43408,8 +43453,8 @@
 					<Top>2207</Top>
 					<Left>5230</Left>
 					<z>0</z>
-					<Width>666</Width>
-					<Height>629</Height>
+					<Width>647</Width>
+					<Height>746</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -43445,7 +43490,7 @@
 					<Top>445</Top>
 					<Left>1157</Left>
 					<z>0</z>
-					<Width>506</Width>
+					<Width>453</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43482,7 +43527,7 @@
 					<Top>2033</Top>
 					<Left>7110</Left>
 					<z>0</z>
-					<Width>726</Width>
+					<Width>647</Width>
 					<Height>629</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43519,7 +43564,7 @@
 					<Top>1714</Top>
 					<Left>1088</Left>
 					<z>0</z>
-					<Width>728</Width>
+					<Width>649</Width>
 					<Height>707</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43556,7 +43601,7 @@
 					<Top>22</Top>
 					<Left>1045</Left>
 					<z>0</z>
-					<Width>666</Width>
+					<Width>594</Width>
 					<Height>356</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43593,7 +43638,7 @@
 					<Top>1427</Top>
 					<Left>3115</Left>
 					<z>0</z>
-					<Width>728</Width>
+					<Width>649</Width>
 					<Height>434</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43630,7 +43675,7 @@
 					<Top>2628</Top>
 					<Left>2086</Left>
 					<z>0</z>
-					<Width>746</Width>
+					<Width>666</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43667,7 +43712,7 @@
 					<Top>1900</Top>
 					<Left>3106</Left>
 					<z>0</z>
-					<Width>767</Width>
+					<Width>683</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43704,7 +43749,7 @@
 					<Top>1603</Top>
 					<Left>63</Left>
 					<z>0</z>
-					<Width>681</Width>
+					<Width>606</Width>
 					<Height>434</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43742,7 +43787,7 @@
 					<Top>56</Top>
 					<Left>1870</Left>
 					<z>0</z>
-					<Width>627</Width>
+					<Width>560</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43779,7 +43824,7 @@
 					<Top>60</Top>
 					<Left>71</Left>
 					<z>0</z>
-					<Width>490</Width>
+					<Width>438</Width>
 					<Height>288</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43835,7 +43880,7 @@
 					<Top>823</Top>
 					<Left>3082</Left>
 					<z>0</z>
-					<Width>767</Width>
+					<Width>683</Width>
 					<Height>551</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43872,7 +43917,7 @@
 					<Top>25</Top>
 					<Left>4206</Left>
 					<z>0</z>
-					<Width>701</Width>
+					<Width>624</Width>
 					<Height>395</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43907,7 +43952,7 @@
 					<Top>453</Top>
 					<Left>4192</Left>
 					<z>0</z>
-					<Width>726</Width>
+					<Width>647</Width>
 					<Height>668</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43942,7 +43987,7 @@
 					<Top>453</Top>
 					<Left>6269</Left>
 					<z>0</z>
-					<Width>661</Width>
+					<Width>589</Width>
 					<Height>356</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -43980,7 +44025,7 @@
 					<Top>1416</Top>
 					<Left>5246</Left>
 					<z>0</z>
-					<Width>679</Width>
+					<Width>606</Width>
 					<Height>239</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44017,7 +44062,7 @@
 					<Top>411</Top>
 					<Left>5250</Left>
 					<z>0</z>
-					<Width>708</Width>
+					<Width>631</Width>
 					<Height>590</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44056,7 +44101,7 @@
 					<Top>987</Top>
 					<Left>6291</Left>
 					<z>0</z>
-					<Width>664</Width>
+					<Width>592</Width>
 					<Height>434</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44099,8 +44144,8 @@
 					<Top>1996</Top>
 					<Left>6130</Left>
 					<z>0</z>
-					<Width>749</Width>
-					<Height>863</Height>
+					<Width>667</Width>
+					<Height>902</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -44137,7 +44182,7 @@
 					<Top>1525</Top>
 					<Left>6395</Left>
 					<z>0</z>
-					<Width>648</Width>
+					<Width>579</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44175,7 +44220,7 @@
 					<Top>54</Top>
 					<Left>5102</Left>
 					<z>0</z>
-					<Width>734</Width>
+					<Width>653</Width>
 					<Height>278</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44212,7 +44257,7 @@
 					<Top>61</Top>
 					<Left>7124</Left>
 					<z>0</z>
-					<Width>645</Width>
+					<Width>576</Width>
 					<Height>473</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44249,7 +44294,7 @@
 					<Top>1043</Top>
 					<Left>7159</Left>
 					<z>0</z>
-					<Width>786</Width>
+					<Width>699</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44289,7 +44334,7 @@
 					<Top>104</Top>
 					<Left>6045</Left>
 					<z>0</z>
-					<Width>768</Width>
+					<Width>683</Width>
 					<Height>239</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44326,7 +44371,7 @@
 					<Top>669</Top>
 					<Left>7140</Left>
 					<z>0</z>
-					<Width>679</Width>
+					<Width>606</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44365,7 +44410,7 @@
 					<Top>1760</Top>
 					<Left>6238</Left>
 					<z>0</z>
-					<Width>630</Width>
+					<Width>562</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44402,7 +44447,7 @@
 					<Top>1706</Top>
 					<Left>5191</Left>
 					<z>0</z>
-					<Width>739</Width>
+					<Width>658</Width>
 					<Height>434</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44440,7 +44485,7 @@
 					<Top>1346</Top>
 					<Left>7270</Left>
 					<z>0</z>
-					<Width>675</Width>
+					<Width>601</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44478,7 +44523,7 @@
 					<Top>1174</Top>
 					<Left>4175</Left>
 					<z>0</z>
-					<Width>744</Width>
+					<Width>663</Width>
 					<Height>434</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44515,7 +44560,7 @@
 					<Top>1711</Top>
 					<Left>4181</Left>
 					<z>0</z>
-					<Width>744</Width>
+					<Width>663</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44552,7 +44597,7 @@
 					<Top>3380</Top>
 					<Left>160</Left>
 					<z>0</z>
-					<Width>812</Width>
+					<Width>723</Width>
 					<Height>473</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44591,7 +44636,7 @@
 					<Top>3391</Top>
 					<Left>1244</Left>
 					<z>0</z>
-					<Width>752</Width>
+					<Width>671</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44628,7 +44673,7 @@
 					<Top>3955</Top>
 					<Left>162</Left>
 					<z>0</z>
-					<Width>739</Width>
+					<Width>659</Width>
 					<Height>473</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44666,7 +44711,7 @@
 					<Top>3728</Top>
 					<Left>1362</Left>
 					<z>0</z>
-					<Width>494</Width>
+					<Width>441</Width>
 					<Height>239</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44704,7 +44749,7 @@
 					<Top>4217</Top>
 					<Left>1184</Left>
 					<z>0</z>
-					<Width>724</Width>
+					<Width>645</Width>
 					<Height>200</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
@@ -44860,23 +44905,23 @@
 					<WorkSpaceShape2>
 						<Id>{E28D10FA-1BA5-4B48-8E05-B74FE51AAEB8}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3243</NamePositionX>
+					<NamePositionX>3204</NamePositionX>
 					<NamePositionY>280</NamePositionY>
 					<Points>
 						<Point>
-							<x>3157</x>
+							<x>3118</x>
 							<y>241</y>
 						</Point>
 						<Point>
-							<x>3157</x>
+							<x>3118</x>
 							<y>272</y>
 						</Point>
 						<Point>
-							<x>3330</x>
+							<x>3290</x>
 							<y>278</y>
 						</Point>
 						<Point>
-							<x>3330</x>
+							<x>3290</x>
 							<y>309</y>
 						</Point>
 					</Points>
@@ -44903,15 +44948,15 @@
 					<WorkSpaceShape2>
 						<Id>{2234AAB8-2059-49CB-8F1C-EA1B538DBF45}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2983</NamePositionX>
+					<NamePositionX>2943</NamePositionX>
 					<NamePositionY>2403</NamePositionY>
 					<Points>
 						<Point>
-							<x>2822</x>
+							<x>2742</x>
 							<y>2426</y>
 						</Point>
 						<Point>
-							<x>2853</x>
+							<x>2773</x>
 							<y>2426</y>
 						</Point>
 						<Point>
@@ -44946,23 +44991,23 @@
 					<WorkSpaceShape2>
 						<Id>{83601A3C-3C62-4DD2-8F11-A9493F5997E4}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>4522</NamePositionX>
+					<NamePositionX>4475</NamePositionX>
 					<NamePositionY>2147</NamePositionY>
 					<Points>
 						<Point>
-							<x>4554</x>
+							<x>4507</x>
 							<y>2164</y>
 						</Point>
 						<Point>
-							<x>4554</x>
+							<x>4507</x>
 							<y>2195</y>
 						</Point>
 						<Point>
-							<x>4530</x>
+							<x>4482</x>
 							<y>2197</y>
 						</Point>
 						<Point>
-							<x>4530</x>
+							<x>4482</x>
 							<y>2228</y>
 						</Point>
 					</Points>
@@ -44989,24 +45034,24 @@
 					<WorkSpaceShape2>
 						<Id>{8331BBC6-0552-4561-BD23-4079196ABB79}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>4813</NamePositionX>
-					<NamePositionY>2484</NamePositionY>
+					<NamePositionX>4766</NamePositionX>
+					<NamePositionY>2513</NamePositionY>
 					<Points>
 						<Point>
-							<x>4960</x>
+							<x>4865</x>
 							<y>2484</y>
 						</Point>
 						<Point>
-							<x>4991</x>
+							<x>4896</x>
 							<y>2484</y>
 						</Point>
 						<Point>
 							<x>5199</x>
-							<y>2522</y>
+							<y>2580</y>
 						</Point>
 						<Point>
 							<x>5230</x>
-							<y>2522</y>
+							<y>2580</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -45032,35 +45077,35 @@
 					<WorkSpaceShape2>
 						<Id>{02C6AC5B-AB84-4C4E-BD74-1AB3359C421B}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1783</NamePositionX>
-					<NamePositionY>2216</NamePositionY>
+					<NamePositionX>1709</NamePositionX>
+					<NamePositionY>2521</NamePositionY>
 					<Points>
 						<Point>
-							<x>1852</x>
+							<x>1778</x>
 							<y>1209</y>
 						</Point>
 						<Point>
-							<x>1883</x>
+							<x>1809</x>
 							<y>1209</y>
 						</Point>
 						<Point>
-							<x>1883</x>
+							<x>1809</x>
 							<y>1209</y>
 						</Point>
 						<Point>
-							<x>1883</x>
+							<x>1809</x>
 							<y>1691</y>
 						</Point>
 						<Point>
-							<x>1504</x>
+							<x>1466</x>
 							<y>1691</y>
 						</Point>
 						<Point>
-							<x>1504</x>
+							<x>1466</x>
 							<y>1691</y>
 						</Point>
 						<Point>
-							<x>1504</x>
+							<x>1466</x>
 							<y>1660</y>
 						</Point>
 					</Points>
@@ -45087,15 +45132,15 @@
 					<WorkSpaceShape2>
 						<Id>{2066EFB9-EFFB-474B-963B-EAD3FD3541EF}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1675</NamePositionX>
+					<NamePositionX>1657</NamePositionX>
 					<NamePositionY>727</NamePositionY>
 					<Points>
 						<Point>
-							<x>1504</x>
+							<x>1466</x>
 							<y>758</y>
 						</Point>
 						<Point>
-							<x>1504</x>
+							<x>1466</x>
 							<y>727</y>
 						</Point>
 						<Point>
@@ -45130,7 +45175,7 @@
 					<WorkSpaceShape2>
 						<Id>{6D8F9C6B-F5B1-47EA-8D7E-0EDB13746E7C}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>840</NamePositionX>
+					<NamePositionX>802</NamePositionX>
 					<NamePositionY>1686</NamePositionY>
 					<Points>
 						<Point>
@@ -45142,11 +45187,11 @@
 							<y>1359</y>
 						</Point>
 						<Point>
-							<x>775</x>
+							<x>700</x>
 							<y>1820</y>
 						</Point>
 						<Point>
-							<x>744</x>
+							<x>669</x>
 							<y>1820</y>
 						</Point>
 					</Points>
@@ -45173,23 +45218,23 @@
 					<WorkSpaceShape2>
 						<Id>{E93375CB-AE2E-4A87-B68A-0C9F6B4A6AE2}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1871</NamePositionX>
-					<NamePositionY>1916</NamePositionY>
+					<NamePositionX>1831</NamePositionX>
+					<NamePositionY>1945</NamePositionY>
 					<Points>
 						<Point>
 							<x>2047</x>
-							<y>1814</y>
+							<y>1872</y>
 						</Point>
 						<Point>
 							<x>2016</x>
-							<y>1814</y>
+							<y>1872</y>
 						</Point>
 						<Point>
-							<x>1847</x>
+							<x>1768</x>
 							<y>2068</y>
 						</Point>
 						<Point>
-							<x>1816</x>
+							<x>1737</x>
 							<y>2068</y>
 						</Point>
 					</Points>
@@ -45216,16 +45261,16 @@
 					<WorkSpaceShape2>
 						<Id>{A087D034-B001-48DE-8648-ECCC0249EF9C}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3009</NamePositionX>
-					<NamePositionY>1728</NamePositionY>
+					<NamePositionX>2965</NamePositionX>
+					<NamePositionY>1757</NamePositionY>
 					<Points>
 						<Point>
-							<x>2846</x>
-							<y>1814</y>
+							<x>2759</x>
+							<y>1872</y>
 						</Point>
 						<Point>
-							<x>2877</x>
-							<y>1814</y>
+							<x>2790</x>
+							<y>1872</y>
 						</Point>
 						<Point>
 							<x>3084</x>
@@ -45259,16 +45304,16 @@
 					<WorkSpaceShape2>
 						<Id>{182D2D30-CFD3-4D48-84E5-4CCBF54DA037}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>3009</NamePositionX>
-					<NamePositionY>2080</NamePositionY>
+					<NamePositionX>2965</NamePositionX>
+					<NamePositionY>2124</NamePositionY>
 					<Points>
 						<Point>
-							<x>2846</x>
-							<y>2176</y>
+							<x>2759</x>
+							<y>2264</y>
 						</Point>
 						<Point>
-							<x>2877</x>
-							<y>2176</y>
+							<x>2790</x>
+							<y>2264</y>
 						</Point>
 						<Point>
 							<x>3075</x>
@@ -45302,16 +45347,16 @@
 					<WorkSpaceShape2>
 						<Id>{02C6AC5B-AB84-4C4E-BD74-1AB3359C421B}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>930</NamePositionX>
-					<NamePositionY>1041</NamePositionY>
+					<NamePositionX>885</NamePositionX>
+					<NamePositionY>1080</NamePositionY>
 					<Points>
 						<Point>
-							<x>889</x>
-							<y>1195</y>
+							<x>798</x>
+							<y>1273</y>
 						</Point>
 						<Point>
-							<x>920</x>
-							<y>1195</y>
+							<x>829</x>
+							<y>1273</y>
 						</Point>
 						<Point>
 							<x>1124</x>
@@ -45345,16 +45390,16 @@
 					<WorkSpaceShape2>
 						<Id>{90A755D7-E5D6-4C64-86E8-507696C00BFA}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>991</NamePositionX>
-					<NamePositionY>659</NamePositionY>
+					<NamePositionX>945</NamePositionX>
+					<NamePositionY>679</NamePositionY>
 					<Points>
 						<Point>
-							<x>889</x>
-							<y>869</y>
+							<x>798</x>
+							<y>908</y>
 						</Point>
 						<Point>
-							<x>920</x>
-							<y>869</y>
+							<x>829</x>
+							<y>908</y>
 						</Point>
 						<Point>
 							<x>1126</x>
@@ -45388,15 +45433,15 @@
 					<WorkSpaceShape2>
 						<Id>{EF55016E-E46B-4BE5-8E09-E8134DC1A8D1}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>739</NamePositionX>
-					<NamePositionY>369</NamePositionY>
+					<NamePositionX>716</NamePositionX>
+					<NamePositionY>368</NamePositionY>
 					<Points>
 						<Point>
-							<x>476</x>
+							<x>430</x>
 							<y>542</y>
 						</Point>
 						<Point>
-							<x>476</x>
+							<x>430</x>
 							<y>511</y>
 						</Point>
 						<Point>
@@ -45431,15 +45476,15 @@
 					<WorkSpaceShape2>
 						<Id>{2234AAB8-2059-49CB-8F1C-EA1B538DBF45}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2986</NamePositionX>
+					<NamePositionX>2946</NamePositionX>
 					<NamePositionY>2672</NamePositionY>
 					<Points>
 						<Point>
-							<x>2832</x>
+							<x>2752</x>
 							<y>2728</y>
 						</Point>
 						<Point>
-							<x>2863</x>
+							<x>2783</x>
 							<y>2728</y>
 						</Point>
 						<Point>
@@ -45474,23 +45519,23 @@
 					<WorkSpaceShape2>
 						<Id>{4C478A46-99A0-4313-9137-A63D434100C1}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>423</NamePositionX>
+					<NamePositionX>387</NamePositionX>
 					<NamePositionY>2095</NamePositionY>
 					<Points>
 						<Point>
-							<x>404</x>
+							<x>366</x>
 							<y>2037</y>
 						</Point>
 						<Point>
-							<x>404</x>
+							<x>366</x>
 							<y>2068</y>
 						</Point>
 						<Point>
-							<x>401</x>
+							<x>368</x>
 							<y>2169</y>
 						</Point>
 						<Point>
-							<x>401</x>
+							<x>368</x>
 							<y>2200</y>
 						</Point>
 					</Points>
@@ -45517,23 +45562,23 @@
 					<WorkSpaceShape2>
 						<Id>{2066EFB9-EFFB-474B-963B-EAD3FD3541EF}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2272</NamePositionX>
+					<NamePositionX>2237</NamePositionX>
 					<NamePositionY>286</NamePositionY>
 					<Points>
 						<Point>
-							<x>2184</x>
+							<x>2150</x>
 							<y>256</y>
 						</Point>
 						<Point>
-							<x>2184</x>
+							<x>2150</x>
 							<y>287</y>
 						</Point>
 						<Point>
-							<x>2409</x>
+							<x>2373</x>
 							<y>361</y>
 						</Point>
 						<Point>
-							<x>2409</x>
+							<x>2373</x>
 							<y>392</y>
 						</Point>
 					</Points>
@@ -45560,16 +45605,16 @@
 					<WorkSpaceShape2>
 						<Id>{6294BD62-D9B9-4CC8-B92C-975F0BEB30CC}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2878</NamePositionX>
-					<NamePositionY>1226</NamePositionY>
+					<NamePositionX>2834</NamePositionX>
+					<NamePositionY>1241</NamePositionY>
 					<Points>
 						<Point>
-							<x>2846</x>
-							<y>1452</y>
+							<x>2759</x>
+							<y>1481</y>
 						</Point>
 						<Point>
-							<x>2877</x>
-							<y>1452</y>
+							<x>2790</x>
+							<y>1481</y>
 						</Point>
 						<Point>
 							<x>3051</x>
@@ -45603,23 +45648,23 @@
 					<WorkSpaceShape2>
 						<Id>{C63A5703-6646-4D24-8EE0-0DFE1EC072FB}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>6613</NamePositionX>
+					<NamePositionX>6565</NamePositionX>
 					<NamePositionY>824</NamePositionY>
 					<Points>
 						<Point>
-							<x>6734</x>
+							<x>6686</x>
 							<y>987</y>
 						</Point>
 						<Point>
-							<x>6734</x>
+							<x>6686</x>
 							<y>956</y>
 						</Point>
 						<Point>
-							<x>6710</x>
+							<x>6662</x>
 							<y>840</y>
 						</Point>
 						<Point>
-							<x>6710</x>
+							<x>6662</x>
 							<y>809</y>
 						</Point>
 					</Points>
@@ -45646,23 +45691,23 @@
 					<WorkSpaceShape2>
 						<Id>{C63A5703-6646-4D24-8EE0-0DFE1EC072FB}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>6391</NamePositionX>
+					<NamePositionX>6367</NamePositionX>
 					<NamePositionY>824</NamePositionY>
 					<Points>
 						<Point>
-							<x>6512</x>
+							<x>6488</x>
 							<y>987</y>
 						</Point>
 						<Point>
-							<x>6512</x>
+							<x>6488</x>
 							<y>956</y>
 						</Point>
 						<Point>
-							<x>6489</x>
+							<x>6465</x>
 							<y>840</y>
 						</Point>
 						<Point>
-							<x>6489</x>
+							<x>6465</x>
 							<y>809</y>
 						</Point>
 					</Points>
@@ -45689,15 +45734,15 @@
 					<WorkSpaceShape2>
 						<Id>{E1C9E6E3-90B8-49A2-85A0-2C382A2DEEB0}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>5995</NamePositionX>
+					<NamePositionX>5958</NamePositionX>
 					<NamePositionY>1332</NamePositionY>
 					<Points>
 						<Point>
-							<x>5925</x>
+							<x>5852</x>
 							<y>1536</y>
 						</Point>
 						<Point>
-							<x>5956</x>
+							<x>5883</x>
 							<y>1536</y>
 						</Point>
 						<Point>
@@ -45732,7 +45777,7 @@
 					<WorkSpaceShape2>
 						<Id>{EA51A6CA-3B44-4BC2-A8BE-355113344D54}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>6016</NamePositionX>
+					<NamePositionX>5977</NamePositionX>
 					<NamePositionY>827</NamePositionY>
 					<Points>
 						<Point>
@@ -45744,11 +45789,11 @@
 							<y>1096</y>
 						</Point>
 						<Point>
-							<x>5989</x>
+							<x>5912</x>
 							<y>706</y>
 						</Point>
 						<Point>
-							<x>5958</x>
+							<x>5881</x>
 							<y>706</y>
 						</Point>
 					</Points>
@@ -45775,23 +45820,23 @@
 					<WorkSpaceShape2>
 						<Id>{A98D91E4-4C4C-49F6-BBB7-DFB162F4DFA2}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>6559</NamePositionX>
+					<NamePositionX>6523</NamePositionX>
 					<NamePositionY>1399</NamePositionY>
 					<Points>
 						<Point>
-							<x>6623</x>
+							<x>6587</x>
 							<y>1421</y>
 						</Point>
 						<Point>
-							<x>6623</x>
+							<x>6587</x>
 							<y>1452</y>
 						</Point>
 						<Point>
-							<x>6719</x>
+							<x>6684</x>
 							<y>1494</y>
 						</Point>
 						<Point>
-							<x>6719</x>
+							<x>6684</x>
 							<y>1525</y>
 						</Point>
 					</Points>
@@ -45818,15 +45863,15 @@
 					<WorkSpaceShape2>
 						<Id>{A98D91E4-4C4C-49F6-BBB7-DFB162F4DFA2}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>6260</NamePositionX>
+					<NamePositionX>6246</NamePositionX>
 					<NamePositionY>1721</NamePositionY>
 					<Points>
 						<Point>
-							<x>6380</x>
+							<x>6352</x>
 							<y>1996</y>
 						</Point>
 						<Point>
-							<x>6380</x>
+							<x>6352</x>
 							<y>1965</y>
 						</Point>
 						<Point>
@@ -45861,23 +45906,23 @@
 					<WorkSpaceShape2>
 						<Id>{EA51A6CA-3B44-4BC2-A8BE-355113344D54}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>5376</NamePositionX>
+					<NamePositionX>5343</NamePositionX>
 					<NamePositionY>297</NamePositionY>
 					<Points>
 						<Point>
-							<x>5469</x>
+							<x>5428</x>
 							<y>332</y>
 						</Point>
 						<Point>
-							<x>5469</x>
+							<x>5428</x>
 							<y>363</y>
 						</Point>
 						<Point>
-							<x>5486</x>
+							<x>5460</x>
 							<y>380</y>
 						</Point>
 						<Point>
-							<x>5486</x>
+							<x>5460</x>
 							<y>411</y>
 						</Point>
 					</Points>
@@ -45904,35 +45949,35 @@
 					<WorkSpaceShape2>
 						<Id>{D199CFAB-9E94-4CC6-B40B-690A229BC9F4}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>7727</NamePositionX>
-					<NamePositionY>1272</NamePositionY>
+					<NamePositionX>8147</NamePositionX>
+					<NamePositionY>1302</NamePositionY>
 					<Points>
 						<Point>
-							<x>7945</x>
+							<x>7858</x>
 							<y>1143</y>
 						</Point>
 						<Point>
-							<x>7976</x>
+							<x>7889</x>
 							<y>1143</y>
 						</Point>
 						<Point>
-							<x>7976</x>
+							<x>7889</x>
 							<y>1143</y>
 						</Point>
 						<Point>
-							<x>7976</x>
+							<x>7889</x>
 							<y>1274</y>
 						</Point>
 						<Point>
-							<x>7421</x>
+							<x>7392</x>
 							<y>1274</y>
 						</Point>
 						<Point>
-							<x>7421</x>
+							<x>7392</x>
 							<y>1274</y>
 						</Point>
 						<Point>
-							<x>7421</x>
+							<x>7392</x>
 							<y>1243</y>
 						</Point>
 					</Points>
@@ -45959,15 +46004,15 @@
 					<WorkSpaceShape2>
 						<Id>{A35383EA-0703-4EBA-AB5F-A68F8E6BD16B}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>5768</NamePositionX>
+					<NamePositionX>5742</NamePositionX>
 					<NamePositionY>242</NamePositionY>
 					<Points>
 						<Point>
-							<x>5722</x>
+							<x>5671</x>
 							<y>411</y>
 						</Point>
 						<Point>
-							<x>5722</x>
+							<x>5671</x>
 							<y>380</y>
 						</Point>
 						<Point>
@@ -46002,23 +46047,23 @@
 					<WorkSpaceShape2>
 						<Id>{15453C36-D1FA-4853-B57E-FAB64B00021D}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>7125</NamePositionX>
+					<NamePositionX>7070</NamePositionX>
 					<NamePositionY>1543</NamePositionY>
 					<Points>
 						<Point>
-							<x>6955</x>
+							<x>6883</x>
 							<y>1204</y>
 						</Point>
 						<Point>
-							<x>6986</x>
+							<x>6914</x>
 							<y>1204</y>
 						</Point>
 						<Point>
-							<x>7473</x>
+							<x>7434</x>
 							<y>2002</y>
 						</Point>
 						<Point>
-							<x>7473</x>
+							<x>7434</x>
 							<y>2033</y>
 						</Point>
 					</Points>
@@ -46045,23 +46090,23 @@
 					<WorkSpaceShape2>
 						<Id>{439F10E7-105D-47FC-AC0C-FC2E1B001559}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>7363</NamePositionX>
+					<NamePositionX>7328</NamePositionX>
 					<NamePositionY>542</NamePositionY>
 					<Points>
 						<Point>
-							<x>7480</x>
+							<x>7443</x>
 							<y>669</y>
 						</Point>
 						<Point>
-							<x>7480</x>
+							<x>7443</x>
 							<y>638</y>
 						</Point>
 						<Point>
-							<x>7446</x>
+							<x>7412</x>
 							<y>565</y>
 						</Point>
 						<Point>
-							<x>7446</x>
+							<x>7412</x>
 							<y>534</y>
 						</Point>
 					</Points>
@@ -46088,23 +46133,23 @@
 					<WorkSpaceShape2>
 						<Id>{73B7EE93-763E-45A1-B894-7701D187CED1}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>7416</NamePositionX>
+					<NamePositionX>7376</NamePositionX>
 					<NamePositionY>896</NamePositionY>
 					<Points>
 						<Point>
-							<x>7552</x>
+							<x>7508</x>
 							<y>1043</y>
 						</Point>
 						<Point>
-							<x>7552</x>
+							<x>7508</x>
 							<y>1012</y>
 						</Point>
 						<Point>
-							<x>7480</x>
+							<x>7443</x>
 							<y>900</y>
 						</Point>
 						<Point>
-							<x>7480</x>
+							<x>7443</x>
 							<y>869</y>
 						</Point>
 					</Points>
@@ -46131,8 +46176,8 @@
 					<WorkSpaceShape2>
 						<Id>{9592E5CD-A497-41B0-A32F-BEFD756A0A6A}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>5945</NamePositionX>
-					<NamePositionY>1872</NamePositionY>
+					<NamePositionX>5904</NamePositionX>
+					<NamePositionY>1873</NamePositionY>
 					<Points>
 						<Point>
 							<x>6238</x>
@@ -46143,11 +46188,11 @@
 							<y>1860</y>
 						</Point>
 						<Point>
-							<x>5961</x>
+							<x>5880</x>
 							<y>1995</y>
 						</Point>
 						<Point>
-							<x>5930</x>
+							<x>5849</x>
 							<y>1995</y>
 						</Point>
 					</Points>
@@ -46174,8 +46219,8 @@
 					<WorkSpaceShape2>
 						<Id>{9592E5CD-A497-41B0-A32F-BEFD756A0A6A}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>5936</NamePositionX>
-					<NamePositionY>1423</NamePositionY>
+					<NamePositionX>5896</NamePositionX>
+					<NamePositionY>1422</NamePositionY>
 					<Points>
 						<Point>
 							<x>6291</x>
@@ -46186,11 +46231,11 @@
 							<y>1312</y>
 						</Point>
 						<Point>
-							<x>5961</x>
+							<x>5880</x>
 							<y>1851</y>
 						</Point>
 						<Point>
-							<x>5930</x>
+							<x>5849</x>
 							<y>1851</y>
 						</Point>
 					</Points>
@@ -46217,23 +46262,23 @@
 					<WorkSpaceShape2>
 						<Id>{83C7C783-DDFF-4FB1-956A-06F3B409AB8E}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>7296</NamePositionX>
+					<NamePositionX>7248</NamePositionX>
 					<NamePositionY>1334</NamePositionY>
 					<Points>
 						<Point>
-							<x>7683</x>
+							<x>7625</x>
 							<y>1243</y>
 						</Point>
 						<Point>
-							<x>7683</x>
+							<x>7625</x>
 							<y>1274</y>
 						</Point>
 						<Point>
-							<x>7608</x>
+							<x>7570</x>
 							<y>1315</y>
 						</Point>
 						<Point>
-							<x>7608</x>
+							<x>7570</x>
 							<y>1346</y>
 						</Point>
 					</Points>
@@ -46260,15 +46305,15 @@
 					<WorkSpaceShape2>
 						<Id>{83C7C783-DDFF-4FB1-956A-06F3B409AB8E}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>6834</NamePositionX>
+					<NamePositionX>6807</NamePositionX>
 					<NamePositionY>1646</NamePositionY>
 					<Points>
 						<Point>
-							<x>6629</x>
+							<x>6575</x>
 							<y>1996</y>
 						</Point>
 						<Point>
-							<x>6629</x>
+							<x>6575</x>
 							<y>1965</y>
 						</Point>
 						<Point>
@@ -46303,23 +46348,23 @@
 					<WorkSpaceShape2>
 						<Id>{218B3815-BF6A-490B-B8CF-BB9BC3CBB4BC}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>4450</NamePositionX>
+					<NamePositionX>4409</NamePositionX>
 					<NamePositionY>1600</NamePositionY>
 					<Points>
 						<Point>
-							<x>4553</x>
+							<x>4512</x>
 							<y>1711</y>
 						</Point>
 						<Point>
-							<x>4553</x>
+							<x>4512</x>
 							<y>1680</y>
 						</Point>
 						<Point>
-							<x>4547</x>
+							<x>4506</x>
 							<y>1639</y>
 						</Point>
 						<Point>
-							<x>4547</x>
+							<x>4506</x>
 							<y>1608</y>
 						</Point>
 					</Points>
@@ -46346,7 +46391,7 @@
 					<WorkSpaceShape2>
 						<Id>{BA6BF403-EA25-45A5-A627-19BBF5865E49}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1008</NamePositionX>
+					<NamePositionX>964</NamePositionX>
 					<NamePositionY>3457</NamePositionY>
 					<Points>
 						<Point>
@@ -46358,11 +46403,11 @@
 							<y>3491</y>
 						</Point>
 						<Point>
-							<x>1003</x>
+							<x>914</x>
 							<y>3538</y>
 						</Point>
 						<Point>
-							<x>972</x>
+							<x>883</x>
 							<y>3538</y>
 						</Point>
 					</Points>
@@ -46389,23 +46434,23 @@
 					<WorkSpaceShape2>
 						<Id>{E55A30BF-E69A-4CC8-9017-C447C6CECF8F}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>449</NamePositionX>
+					<NamePositionX>407</NamePositionX>
 					<NamePositionY>3844</NamePositionY>
 					<Points>
 						<Point>
-							<x>566</x>
+							<x>522</x>
 							<y>3853</y>
 						</Point>
 						<Point>
-							<x>566</x>
+							<x>522</x>
 							<y>3884</y>
 						</Point>
 						<Point>
-							<x>532</x>
+							<x>492</x>
 							<y>3924</y>
 						</Point>
 						<Point>
-							<x>532</x>
+							<x>492</x>
 							<y>3955</y>
 						</Point>
 					</Points>
@@ -46432,15 +46477,15 @@
 					<WorkSpaceShape2>
 						<Id>{258B06BB-0191-4B34-99C8-0C1C7F4EB782}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1067</NamePositionX>
+					<NamePositionX>1022</NamePositionX>
 					<NamePositionY>3711</NamePositionY>
 					<Points>
 						<Point>
-							<x>972</x>
+							<x>883</x>
 							<y>3695</y>
 						</Point>
 						<Point>
-							<x>1003</x>
+							<x>914</x>
 							<y>3695</y>
 						</Point>
 						<Point>
@@ -46475,15 +46520,15 @@
 					<WorkSpaceShape2>
 						<Id>{D8AF9B43-BA70-49AA-9979-0C3943FBAA1E}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>942</NamePositionX>
+					<NamePositionX>902</NamePositionX>
 					<NamePositionY>4194</NamePositionY>
 					<Points>
 						<Point>
-							<x>901</x>
+							<x>821</x>
 							<y>4192</y>
 						</Point>
 						<Point>
-							<x>932</x>
+							<x>852</x>
 							<y>4192</y>
 						</Point>
 						<Point>
@@ -46518,23 +46563,23 @@
 					<WorkSpaceShape2>
 						<Id>{D8AF9B43-BA70-49AA-9979-0C3943FBAA1E}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>1477</NamePositionX>
+					<NamePositionX>1444</NamePositionX>
 					<NamePositionY>4032</NamePositionY>
 					<Points>
 						<Point>
-							<x>1609</x>
+							<x>1582</x>
 							<y>3967</y>
 						</Point>
 						<Point>
-							<x>1609</x>
+							<x>1582</x>
 							<y>3998</y>
 						</Point>
 						<Point>
-							<x>1546</x>
+							<x>1506</x>
 							<y>4186</y>
 						</Point>
 						<Point>
-							<x>1546</x>
+							<x>1506</x>
 							<y>4217</y>
 						</Point>
 					</Points>
@@ -60763,7 +60808,7 @@
 					<Left>1866</Left>
 					<z>0</z>
 					<Width>697</Width>
-					<Height>590</Height>
+					<Height>629</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -61022,7 +61067,7 @@
 					<Left>1919</Left>
 					<z>0</z>
 					<Width>677</Width>
-					<Height>356</Height>
+					<Height>434</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -61062,7 +61107,7 @@
 					<Left>2932</Left>
 					<z>0</z>
 					<Width>663</Width>
-					<Height>356</Height>
+					<Height>395</Height>
 					<dz>0</dz>
 					<RecalculateSizes>1</RecalculateSizes>
 					<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -61302,7 +61347,7 @@
 						<Id>{097E646A-5878-4A23-9198-786E1723181E}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>1340</NamePositionX>
-					<NamePositionY>747</NamePositionY>
+					<NamePositionY>754</NamePositionY>
 					<Points>
 						<Point>
 							<x>1015</x>
@@ -61314,11 +61359,11 @@
 						</Point>
 						<Point>
 							<x>1835</x>
-							<y>1090</y>
+							<y>1103</y>
 						</Point>
 						<Point>
 							<x>1866</x>
-							<y>1090</y>
+							<y>1103</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -61431,15 +61476,15 @@
 						<Id>{CF9B1CC5-01CB-406C-BCA3-ADE8589AE812}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>1602</NamePositionX>
-					<NamePositionY>1153</NamePositionY>
+					<NamePositionY>1166</NamePositionY>
 					<Points>
 						<Point>
 							<x>1866</x>
-							<y>1286</y>
+							<y>1312</y>
 						</Point>
 						<Point>
 							<x>1835</x>
-							<y>1286</y>
+							<y>1312</y>
 						</Point>
 						<Point>
 							<x>1569</x>
@@ -61473,24 +61518,24 @@
 					<WorkSpaceShape2>
 						<Id>{0D450927-428E-492D-9E1C-87F9DBFBFA7A}</Id>
 					</WorkSpaceShape2>
-					<NamePositionX>2647</NamePositionX>
-					<NamePositionY>1317</NamePositionY>
+					<NamePositionX>2648</NamePositionX>
+					<NamePositionY>1336</NamePositionY>
 					<Points>
 						<Point>
 							<x>2563</x>
-							<y>1286</y>
+							<y>1312</y>
 						</Point>
 						<Point>
 							<x>2594</x>
-							<y>1286</y>
+							<y>1312</y>
 						</Point>
 						<Point>
 							<x>2901</x>
-							<y>1468</y>
+							<y>1481</y>
 						</Point>
 						<Point>
 							<x>2932</x>
-							<y>1468</y>
+							<y>1481</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -61517,7 +61562,7 @@
 						<Id>{097E646A-5878-4A23-9198-786E1723181E}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>2637</NamePositionX>
-					<NamePositionY>901</NamePositionY>
+					<NamePositionY>908</NamePositionY>
 					<Points>
 						<Point>
 							<x>2911</x>
@@ -61529,11 +61574,11 @@
 						</Point>
 						<Point>
 							<x>2594</x>
-							<y>1090</y>
+							<y>1103</y>
 						</Point>
 						<Point>
 							<x>2563</x>
-							<y>1090</y>
+							<y>1103</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -61560,7 +61605,7 @@
 						<Id>{88CE9183-F8E7-4553-A720-4146D8A4ACE8}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>1246</NamePositionX>
-					<NamePositionY>1673</NamePositionY>
+					<NamePositionY>1686</NamePositionY>
 					<Points>
 						<Point>
 							<x>774</x>
@@ -61572,11 +61617,11 @@
 						</Point>
 						<Point>
 							<x>1888</x>
-							<y>1779</y>
+							<y>1805</y>
 						</Point>
 						<Point>
 							<x>1919</x>
-							<y>1779</y>
+							<y>1805</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -61603,23 +61648,23 @@
 						<Id>{88CE9183-F8E7-4553-A720-4146D8A4ACE8}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>2664</NamePositionX>
-					<NamePositionY>1652</NamePositionY>
+					<NamePositionY>1684</NamePositionY>
 					<Points>
 						<Point>
 							<x>2932</x>
-							<y>1586</y>
+							<y>1612</y>
 						</Point>
 						<Point>
 							<x>2901</x>
-							<y>1586</y>
+							<y>1612</y>
 						</Point>
 						<Point>
 							<x>2627</x>
-							<y>1838</y>
+							<y>1877</y>
 						</Point>
 						<Point>
 							<x>2596</x>
-							<y>1838</y>
+							<y>1877</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -61646,7 +61691,7 @@
 						<Id>{88CE9183-F8E7-4553-A720-4146D8A4ACE8}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>2152</NamePositionX>
-					<NamePositionY>2080</NamePositionY>
+					<NamePositionY>2119</NamePositionY>
 					<Points>
 						<Point>
 							<x>2246</x>
@@ -61658,11 +61703,11 @@
 						</Point>
 						<Point>
 							<x>2258</x>
-							<y>2047</y>
+							<y>2125</y>
 						</Point>
 						<Point>
 							<x>2258</x>
-							<y>2016</y>
+							<y>2094</y>
 						</Point>
 					</Points>
 				</WorkSpaceLinePERRelationPG83>
@@ -61689,15 +61734,15 @@
 						<Id>{2EDF73A3-A028-40CD-84F2-681CD2887C3B}</Id>
 					</WorkSpaceShape2>
 					<NamePositionX>1686</NamePositionX>
-					<NamePositionY>1989</NamePositionY>
+					<NamePositionY>2015</NamePositionY>
 					<Points>
 						<Point>
 							<x>1919</x>
-							<y>1897</y>
+							<y>1949</y>
 						</Point>
 						<Point>
 							<x>1888</x>
-							<y>1897</y>
+							<y>1949</y>
 						</Point>
 						<Point>
 							<x>1685</x>
@@ -61867,7 +61912,7 @@
 			<Company>FH Technikum Wien</Company>
 			<Version>3.0</Version>
 			<CreatedDate>2009-04-17T11:15:21.000+02:00</CreatedDate>
-			<ModifiedDate>2014-04-18T11:47:28.243+02:00</ModifiedDate>
+			<ModifiedDate>2014-05-05T15:33:48.298+02:00</ModifiedDate>
 			<Project>FH-Complete 3.0</Project>
 			<Description>&lt;?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?&gt;
 </Description>
@@ -74003,7 +74048,9 @@ Studiengang&gt;0 und Semester&gt;0 -&gt; News fuer bestimmtes Semester im Studie
 						<Id>{ECB8F02F-B683-4252-8508-ED9D064C9AF3}</Id>
 					</DataType>
 					<UserDataType/>
-					<IndexItems/>
+					<IndexItems>
+						<Id>{BBE9CCFC-1854-49B7-A4CF-ECCF9DBADD19}</Id>
+					</IndexItems>
 					<Default/>
 					<CheckConstraints/>
 					<KeyConstraint/>
@@ -74132,7 +74179,9 @@ Studiengang&gt;0 und Semester&gt;0 -&gt; News fuer bestimmtes Semester im Studie
 						<Id>{3AA5E900-D254-4FBD-AD67-AD230407284C}</Id>
 					</DataType>
 					<UserDataType/>
-					<IndexItems/>
+					<IndexItems>
+						<Id>{7A40A736-6077-4222-A544-532EE8C52A3A}</Id>
+					</IndexItems>
 					<Default/>
 					<CheckConstraints/>
 					<KeyConstraint/>
@@ -74173,7 +74222,9 @@ Studiengang&gt;0 und Semester&gt;0 -&gt; News fuer bestimmtes Semester im Studie
 						<Id>{5EBD99F4-5263-4410-9892-11DB7C2DF84B}</Id>
 					</DataType>
 					<UserDataType/>
-					<IndexItems/>
+					<IndexItems>
+						<Id>{1C9AB14B-700E-4D21-9EE3-F240DA24789B}</Id>
+					</IndexItems>
 					<Default/>
 					<CheckConstraints/>
 					<KeyConstraint/>
@@ -74598,7 +74649,137 @@ Studiengang&gt;0 und Semester&gt;0 -&gt; News fuer bestimmtes Semester im Studie
 			<PK>
 				<Id>{06A8DB53-4118-41E6-8BFA-496C0EEE4860}</Id>
 			</PK>
-			<Indexes/>
+			<Indexes>
+				<PERIndexPG83 ObjectType="2012" CSAOName="PERIndexPG83">
+					<Id>{F56A4B4A-095A-4FCD-A8D0-67CDC4DBECE7}</Id>
+					<Name>idx_reservierung_datum</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{8A4D1BCE-7B95-46EF-86E3-634F12122C84}</HistoryID>
+					<GlobalOrder>0</GlobalOrder>
+					<RNOffset>0</RNOffset>
+					<RNLength>0</RNLength>
+					<IgnoreNC>0</IgnoreNC>
+					<GenerateCode>1</GenerateCode>
+					<BeforeScript></BeforeScript>
+					<AfterScript></AfterScript>
+					<Notes></Notes>
+					<Comments></Comments>
+					<Unique>0</Unique>
+					<Caption>idx_reservierung_datum</Caption>
+					<Expression></Expression>
+					<GenerateExpression>0</GenerateExpression>
+					<IndexItems>
+						<PERIndexItemPG83 ObjectType="2013" CSAOName="PERIndexItemPG83">
+							<Id>{1C9AB14B-700E-4D21-9EE3-F240DA24789B}</Id>
+							<Name>datum</Name>
+							<Ordinal>0</Ordinal>
+							<HistoryID>{D3339CC7-31EA-4EDF-A9AE-C40F3B417A3E}</HistoryID>
+							<GlobalOrder>0</GlobalOrder>
+							<GenerateCode>1</GenerateCode>
+							<BeforeScript></BeforeScript>
+							<AfterScript></AfterScript>
+							<Notes></Notes>
+							<Comments></Comments>
+							<SortDescending>0</SortDescending>
+							<Attribute>
+								<Id>{BAB09513-19A0-4465-B33B-7AB1A972F6C3}</Id>
+							</Attribute>
+							<ForeignKeys/>
+						</PERIndexItemPG83>
+					</IndexItems>
+					<Relations/>
+					<IxAccess>btree</IxAccess>
+					<Predicate></Predicate>
+					<Tablespace/>
+					<FillFactor></FillFactor>
+				</PERIndexPG83>
+				<PERIndexPG83 ObjectType="2012" CSAOName="PERIndexPG83">
+					<Id>{9749AFB0-6035-4F97-9C56-5E5D5CCDD1DF}</Id>
+					<Name>idx_reservierung_ort</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{45BDD5A5-3C0B-4B5F-80F9-4ADCB8F543FD}</HistoryID>
+					<GlobalOrder>0</GlobalOrder>
+					<RNOffset>0</RNOffset>
+					<RNLength>0</RNLength>
+					<IgnoreNC>0</IgnoreNC>
+					<GenerateCode>1</GenerateCode>
+					<BeforeScript></BeforeScript>
+					<AfterScript></AfterScript>
+					<Notes></Notes>
+					<Comments></Comments>
+					<Unique>0</Unique>
+					<Caption>idx_reservierung_ort</Caption>
+					<Expression></Expression>
+					<GenerateExpression>0</GenerateExpression>
+					<IndexItems>
+						<PERIndexItemPG83 ObjectType="2013" CSAOName="PERIndexItemPG83">
+							<Id>{BBE9CCFC-1854-49B7-A4CF-ECCF9DBADD19}</Id>
+							<Name>ort_kurzbz</Name>
+							<Ordinal>0</Ordinal>
+							<HistoryID>{6CEE8A9F-D86A-44B5-8815-7F7646811F37}</HistoryID>
+							<GlobalOrder>0</GlobalOrder>
+							<GenerateCode>1</GenerateCode>
+							<BeforeScript></BeforeScript>
+							<AfterScript></AfterScript>
+							<Notes></Notes>
+							<Comments></Comments>
+							<SortDescending>0</SortDescending>
+							<Attribute>
+								<Id>{DB469A68-F551-4B45-B1AF-B338824947DF}</Id>
+							</Attribute>
+							<ForeignKeys/>
+						</PERIndexItemPG83>
+					</IndexItems>
+					<Relations/>
+					<IxAccess>btree</IxAccess>
+					<Predicate></Predicate>
+					<Tablespace/>
+					<FillFactor></FillFactor>
+				</PERIndexPG83>
+				<PERIndexPG83 ObjectType="2012" CSAOName="PERIndexPG83">
+					<Id>{54B5ECFC-3E47-4D2D-8709-0718891C1038}</Id>
+					<Name>idx_reservierung_stunde</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{1D1DA993-225C-45C0-91AB-AB3FAD64DFAA}</HistoryID>
+					<GlobalOrder>0</GlobalOrder>
+					<RNOffset>0</RNOffset>
+					<RNLength>0</RNLength>
+					<IgnoreNC>0</IgnoreNC>
+					<GenerateCode>1</GenerateCode>
+					<BeforeScript></BeforeScript>
+					<AfterScript></AfterScript>
+					<Notes></Notes>
+					<Comments></Comments>
+					<Unique>0</Unique>
+					<Caption>idx_reservierung_stunde</Caption>
+					<Expression></Expression>
+					<GenerateExpression>0</GenerateExpression>
+					<IndexItems>
+						<PERIndexItemPG83 ObjectType="2013" CSAOName="PERIndexItemPG83">
+							<Id>{7A40A736-6077-4222-A544-532EE8C52A3A}</Id>
+							<Name>stunde</Name>
+							<Ordinal>0</Ordinal>
+							<HistoryID>{BD8A1E28-0379-4A27-91A7-FA8970071856}</HistoryID>
+							<GlobalOrder>0</GlobalOrder>
+							<GenerateCode>1</GenerateCode>
+							<BeforeScript></BeforeScript>
+							<AfterScript></AfterScript>
+							<Notes></Notes>
+							<Comments></Comments>
+							<SortDescending>0</SortDescending>
+							<Attribute>
+								<Id>{4494C09E-B054-4F23-A60F-8765A8A9D1E2}</Id>
+							</Attribute>
+							<ForeignKeys/>
+						</PERIndexItemPG83>
+					</IndexItems>
+					<Relations/>
+					<IxAccess>btree</IxAccess>
+					<Predicate></Predicate>
+					<Tablespace/>
+					<FillFactor></FillFactor>
+				</PERIndexPG83>
+			</Indexes>
 			<CheckConstraints/>
 			<Category/>
 			<Triggers/>
@@ -116444,6 +116625,7 @@ ALTER TABLE tbl_mitarbeiter ALTER COLUMN personalnummer DROP NOT NULL;</Comments
 				<Id>{CFCFB0A9-CF7B-4E5A-B6A0-909B2FAFB267}</Id>
 				<Id>{62BFCF57-8025-4182-8001-0D73ABC7270E}</Id>
 				<Id>{A884D03E-BAB0-4FB7-9893-C3BA7C196082}</Id>
+				<Id>{6FB61500-8D20-4ECA-850A-AC1F5A4B33B7}</Id>
 			</Relations>
 			<Attributes>
 				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
@@ -116485,6 +116667,7 @@ ALTER TABLE tbl_mitarbeiter ALTER COLUMN personalnummer DROP NOT NULL;</Comments
 						<Id>{4892A55C-2CE8-489D-A540-C655B1D6CCE0}</Id>
 						<Id>{DA865EBB-11A7-46C6-AA1B-788D24C20850}</Id>
 						<Id>{FF9B45A3-39A2-455B-8240-BB6D8DB5C38F}</Id>
+						<Id>{3626DB7C-D9E7-4BE1-A748-86B7169EC687}</Id>
 					</PKForeignKeys>
 					<FKForeignKeys/>
 					<DictType/>
@@ -117327,6 +117510,7 @@ ALTER TABLE tbl_mitarbeiter ALTER COLUMN personalnummer DROP NOT NULL;</Comments
 								<Id>{4892A55C-2CE8-489D-A540-C655B1D6CCE0}</Id>
 								<Id>{DA865EBB-11A7-46C6-AA1B-788D24C20850}</Id>
 								<Id>{FF9B45A3-39A2-455B-8240-BB6D8DB5C38F}</Id>
+								<Id>{3626DB7C-D9E7-4BE1-A748-86B7169EC687}</Id>
 							</ForeignKeys>
 						</PERKeyConstraintItemPG83>
 					</KeyItems>
@@ -117341,6 +117525,7 @@ ALTER TABLE tbl_mitarbeiter ALTER COLUMN personalnummer DROP NOT NULL;</Comments
 						<Id>{2DF1A773-EEDB-42A1-8B20-E4CCE2E25B29}</Id>
 						<Id>{CFCFB0A9-CF7B-4E5A-B6A0-909B2FAFB267}</Id>
 						<Id>{62BFCF57-8025-4182-8001-0D73ABC7270E}</Id>
+						<Id>{6FB61500-8D20-4ECA-850A-AC1F5A4B33B7}</Id>
 					</Relations>
 					<Attribute/>
 					<Tablespace/>
@@ -160259,6 +160444,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>{A408F1DC-339A-4510-90FA-025790931F49}</Id>
+					<Name>email</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{06E90294-D2E3-45FA-8CB3-4106155C2AE9}</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>false</DefaultValue>
+					<NotNull>1</NotNull>
+					<Migrated>0</Migrated>
+					<Caption>email</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<FKForeignKeys/>
+					<DictType/>
+					<Domain/>
+					<DataType>
+						<Id>{D64069A5-B04A-490B-B0A2-5144DEA81A2E}</Id>
+					</DataType>
+					<UserDataType/>
+					<IndexItems/>
+					<Default/>
+					<CheckConstraints/>
+					<KeyConstraint/>
+					<ArrDims></ArrDims>
+					<IsArray>0</IsArray>
+				</PERAttributePG83>
 			</Attributes>
 			<Keys>
 				<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
@@ -180366,6 +180592,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>{08D23207-DF27-4EF7-B934-5E874EB8C308}</Id>
+					<Name>pruefungsintervall</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{F44441CC-4B63-400A-BCA4-231414F4CF0E}</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>pruefungsintervall</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<FKForeignKeys/>
+					<DictType/>
+					<Domain/>
+					<DataType>
+						<Id>{3AA5E900-D254-4FBD-AD67-AD230407284C}</Id>
+					</DataType>
+					<UserDataType/>
+					<IndexItems/>
+					<Default/>
+					<CheckConstraints/>
+					<KeyConstraint/>
+					<ArrDims></ArrDims>
+					<IsArray>0</IsArray>
+				</PERAttributePG83>
 			</Attributes>
 			<Keys>
 				<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
@@ -181314,6 +181581,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>{E7884225-D345-4CE4-A43B-6B9D0C95BA32}</Id>
+					<Name>statusupdatevon</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{482C2318-9034-41B2-8BCD-1579E00BD732}</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>32</DataTypeParam1>
+					<DataTypeParam2></DataTypeParam2>
+					<KeepForeignKey>0</KeepForeignKey>
+					<DefaultValue></DefaultValue>
+					<NotNull>0</NotNull>
+					<Migrated>0</Migrated>
+					<Caption>statusupdatevon</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>
+				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
+					<Id>{1C06EA6F-0601-4411-97AC-2D7C634233D2}</Id>
+					<Name>statusupdateamum</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{27FC8AC5-DFBF-498E-B2B9-21FCA4CBA102}</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>statusupdateamum</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<FKForeignKeys/>
+					<DictType/>
+					<Domain/>
+					<DataType>
+						<Id>{342E3F36-138D-40F7-B1B2-D9489C848835}</Id>
+					</DataType>
+					<UserDataType/>
+					<IndexItems/>
+					<Default/>
+					<CheckConstraints/>
+					<KeyConstraint/>
+					<ArrDims></ArrDims>
+					<IsArray>0</IsArray>
+				</PERAttributePG83>
 			</Attributes>
 			<Keys>
 				<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
@@ -181400,6 +181749,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
 			<Relations>
 				<Id>{F41A97F4-D7A0-4D1F-BD0E-45534BF21F5A}</Id>
 				<Id>{DD8308FF-C083-4378-BBF5-81D5D8753C23}</Id>
+				<Id>{6FB61500-8D20-4ECA-850A-AC1F5A4B33B7}</Id>
 			</Relations>
 			<Attributes>
 				<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
@@ -181736,6 +182086,49 @@ 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>{A19B0BC3-9AF8-4501-9FCC-285E0318E2F1}</Id>
+					<Name>ort_kurzbz</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{FA836543-DF0F-4506-84D9-0CF8568453A1}</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>16</DataTypeParam1>
+					<DataTypeParam2></DataTypeParam2>
+					<KeepForeignKey>0</KeepForeignKey>
+					<DefaultValue></DefaultValue>
+					<NotNull>0</NotNull>
+					<Migrated>1</Migrated>
+					<Caption>ort_kurzbz</Caption>
+					<Unique>0</Unique>
+					<OriginalName></OriginalName>
+					<CheckConstraint></CheckConstraint>
+					<CheckConstraintName></CheckConstraintName>
+					<KeyConstraintItems/>
+					<PKForeignKeys/>
+					<FKForeignKeys>
+						<Id>{3626DB7C-D9E7-4BE1-A748-86B7169EC687}</Id>
+					</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">
@@ -211049,6 +211442,64 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
 			<MatchType>SIMPLE</MatchType>
 			<CreateIndexToFK>1</CreateIndexToFK>
 		</PERRelationPG83>
+		<PERRelationPG83 ObjectType="2004" CSAOName="PERRelationPG83">
+			<Id>{6FB61500-8D20-4ECA-850A-AC1F5A4B33B7}</Id>
+			<Name>fk_pruefungstermin_ort_ort_kurzbz</Name>
+			<Ordinal>0</Ordinal>
+			<HistoryID>{512BCA70-1184-4DF7-BE56-91F96FE023F1}</HistoryID>
+			<GlobalOrder>0</GlobalOrder>
+			<O1>
+				<Id>{04908758-A69E-4567-9BCA-69420A749BE3}</Id>
+			</O1>
+			<O2>
+				<Id>{99AB0FB0-41E5-493B-8E1C-9B0F83F34240}</Id>
+			</O2>
+			<GenerateCode>1</GenerateCode>
+			<Comments></Comments>
+			<Notes></Notes>
+			<Identifying>0</Identifying>
+			<MandatoryParent>0</MandatoryParent>
+			<MandatoryChild>0</MandatoryChild>
+			<CardinalityChild>-1</CardinalityChild>
+			<InverseName></InverseName>
+			<Caption>fk_pruefungstermin_ort_ort_kurzbz</Caption>
+			<InverseCaption></InverseCaption>
+			<RefIntegrityParentUpdate>0</RefIntegrityParentUpdate>
+			<RefIntegrityParentDelete>0</RefIntegrityParentDelete>
+			<RefIntegrityChildUpdate>0</RefIntegrityChildUpdate>
+			<RefIntegrityChildInsert>0</RefIntegrityChildInsert>
+			<Key>
+				<Id>{0B987B06-A919-4045-B6D3-4D2790E912C7}</Id>
+			</Key>
+			<ForeignKeys>
+				<PERForeignKeyPG83 ObjectType="2014" CSAOName="PERForeignKeyPG83">
+					<Id>{3626DB7C-D9E7-4BE1-A748-86B7169EC687}</Id>
+					<Name>FK ort_kurzbz - ort_kurzbz</Name>
+					<Ordinal>0</Ordinal>
+					<HistoryID>{36BF6E65-4854-4E63-A4A4-92AC56A438B5}</HistoryID>
+					<GlobalOrder>0</GlobalOrder>
+					<GenerateCode>1</GenerateCode>
+					<BeforeScript></BeforeScript>
+					<AfterScript></AfterScript>
+					<Notes></Notes>
+					<Comments></Comments>
+					<AttrParent>
+						<Id>{D7C0C377-5E16-4939-B1D6-3B6694D54E2A}</Id>
+					</AttrParent>
+					<AttrChild>
+						<Id>{A19B0BC3-9AF8-4501-9FCC-285E0318E2F1}</Id>
+					</AttrChild>
+					<KeyConstraintItem>
+						<Id>{596188FD-A730-4304-9A9A-12E2D8A73E94}</Id>
+					</KeyConstraintItem>
+				</PERForeignKeyPG83>
+			</ForeignKeys>
+			<ToDoItems/>
+			<Deferred>0</Deferred>
+			<Deferrable>0</Deferrable>
+			<MatchType>SIMPLE</MatchType>
+			<CreateIndexToFK>1</CreateIndexToFK>
+		</PERRelationPG83>
 	</Relations>
 	<Defaults/>
 	<Rules/>
diff --git a/system/checksystem.php b/system/checksystem.php
index a36dd8a1b..ffeebf4b2 100644
--- a/system/checksystem.php
+++ b/system/checksystem.php
@@ -1469,9 +1469,9 @@ if($result = @$db->db_query("SELECT * FROM information_schema.role_table_grants
 		$qry = "GRANT UPDATE ON public.tbl_benutzer TO web;";
 	
 		if(!$db->db_query($qry))
-			echo '<strong>public.tbl_benutzer: '.$db->db_last_error().'</strong><br>';
+			echo '<br><strong>public.tbl_benutzer: '.$db->db_last_error().'</strong><br>';
 		else
-			echo 'public.tbl_benutzer: Update rechte fuer User web erteilt';
+			echo '<br>public.tbl_benutzer: Update rechte fuer User web erteilt';
 	}		
 }
 
@@ -1482,9 +1482,9 @@ if(!$result = @$db->db_query("SELECT pruefungsanmeldung_id FROM lehre.tbl_pruefu
 		. "ALTER TABLE lehre.tbl_pruefung ADD CONSTRAINT fk_pruefung_pruefungsanmeldung_id FOREIGN KEY (pruefungsanmeldung_id) REFERENCES campus.tbl_pruefungsanmeldung (pruefungsanmeldung_id) ON DELETE RESTRICT ON UPDATE CASCADE;";
 
 	if(!$db->db_query($qry))
-		echo '<strong>lehre.tbl_pruefung: '.$db->db_last_error().'</strong><br>';
+		echo '<br><strong>lehre.tbl_pruefung: '.$db->db_last_error().'</strong><br>';
 	else
-		echo 'lehre.tbl_pruefung: Spalte pruefungsanmeldung_id hinzugefuegt';
+		echo '<br>lehre.tbl_pruefung: Spalte pruefungsanmeldung_id hinzugefuegt';
 }
 
 // pruefungsintervall in campus.tbl_pruefung
@@ -1531,12 +1531,97 @@ if($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_reservieru
 				CREATE INDEX idx_reservierung_stunde ON campus.tbl_reservierung USING btree (stunde);";
 	
 		if(!$db->db_query($qry))
-			echo '<strong>Indizes: '.$db->db_last_error().'</strong><br>';
+			echo '<br><strong>Indizes: '.$db->db_last_error().'</strong><br>';
 		else
-			echo 'Diverse Indizes fuer Tabelle Reservierung hinzugefügt';
+			echo '<br>Diverse Indizes fuer Tabelle Reservierung hinzugefügt';
 	}
 }
 
+// vw_student erweitern
+if(!$result = @$db->db_query("SELECT aktivierungscode FROM campus.vw_student"))
+{
+	$qry = "CREATE OR REPLACE VIEW campus.vw_student AS
+		SELECT 
+			tbl_benutzer.uid, tbl_student.matrikelnr, tbl_student.prestudent_id, tbl_student.studiengang_kz, tbl_student.semester, 
+			tbl_student.verband, tbl_student.gruppe, tbl_benutzer.person_id, tbl_benutzer.alias, tbl_person.geburtsnation, tbl_person.sprache, 
+			tbl_person.anrede, tbl_person.titelpost, tbl_person.titelpre, tbl_person.nachname, tbl_person.vorname, tbl_person.vornamen, tbl_person.gebdatum, 
+			tbl_person.gebort, tbl_person.gebzeit, tbl_person.foto, tbl_person.anmerkung, tbl_person.homepage, tbl_person.svnr, tbl_person.ersatzkennzeichen, 
+			tbl_person.geschlecht, tbl_person.familienstand, tbl_person.anzahlkinder, tbl_benutzer.aktiv, tbl_student.updateamum, tbl_student.updatevon, 
+			tbl_student.insertamum, tbl_student.insertvon, tbl_student.ext_id, tbl_benutzer.updateaktivam, tbl_benutzer.updateaktivvon,
+			tbl_benutzer.aktivierungscode, 
+			(SELECT kontakt FROM public.tbl_kontakt WHERE person_id=tbl_person.person_id AND kontakttyp='email' ORDER BY zustellung desc Limit 1) as email_privat
+		FROM 
+			public.tbl_student
+			JOIN public.tbl_benutzer ON tbl_student.student_uid::text = tbl_benutzer.uid::text
+			JOIN public.tbl_person USING (person_id);";
+
+	if(!$db->db_query($qry))
+		echo '<br><strong>campus.vw_student: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>campus.vw_student: Neue Spalten aktivierungscode und email_privat zur View hinzugefuegt';
+}
+
+// vw_mitarbeiter erweitern
+if(!$result = @$db->db_query("SELECT aktivierungscode FROM campus.vw_mitarbeiter"))
+{
+	$qry = "CREATE OR REPLACE VIEW campus.vw_mitarbeiter AS
+	SELECT tbl_benutzer.uid, tbl_mitarbeiter.ausbildungcode, tbl_mitarbeiter.personalnummer, tbl_mitarbeiter.kurzbz, tbl_mitarbeiter.lektor, 
+			tbl_mitarbeiter.fixangestellt, tbl_mitarbeiter.telefonklappe, tbl_benutzer.person_id, tbl_benutzer.alias, tbl_person.geburtsnation, 
+			tbl_person.sprache, tbl_person.anrede, tbl_person.titelpost, tbl_person.titelpre, tbl_person.nachname, tbl_person.vorname, tbl_person.vornamen,
+			tbl_person.gebdatum, tbl_person.gebort, tbl_person.gebzeit, tbl_person.foto, tbl_mitarbeiter.anmerkung, tbl_person.homepage, tbl_person.svnr, 
+			tbl_person.ersatzkennzeichen, tbl_person.geschlecht, tbl_person.familienstand, tbl_person.anzahlkinder, tbl_mitarbeiter.ort_kurzbz, tbl_benutzer.aktiv, 
+			tbl_mitarbeiter.bismelden, tbl_mitarbeiter.standort_id, tbl_mitarbeiter.updateamum, tbl_mitarbeiter.updatevon, tbl_mitarbeiter.insertamum, 
+			tbl_mitarbeiter.insertvon, tbl_mitarbeiter.ext_id, tbl_benutzer.aktivierungscode,
+			(SELECT kontakt FROM public.tbl_kontakt WHERE person_id=tbl_person.person_id AND kontakttyp='email' ORDER BY zustellung desc Limit 1) as email_privat
+			
+	FROM public.tbl_mitarbeiter
+	JOIN public.tbl_benutzer ON tbl_mitarbeiter.mitarbeiter_uid::text = tbl_benutzer.uid::text
+	JOIN public.tbl_person USING (person_id);";
+
+	if(!$db->db_query($qry))
+		echo '<strong>campus.vw_mitarbeiter: '.$db->db_last_error().'</strong><br>';
+	else
+		echo 'campus.vw_mitarbeiter: Neue Spalten aktivierungscode und email_privat zur View hinzugefuegt';
+}
+// Ampel boolean email
+if(!$result = @$db->db_query("SELECT email FROM public.tbl_ampel"))
+{
+	$qry = "ALTER TABLE public.tbl_ampel ADD COLUMN email boolean DEFAULT false NOT NULL";
+
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_ampel: '.$db->db_last_error().'</strong><br>';
+	else
+		echo 'public.tbl_ampel: Neue Spalte email hinzugefügt';
+}
+
+// Fehlender Foreign Key
+if($result = @$db->db_query("SELECT * FROM information_schema.table_constraints WHERE constraint_name='fk_pruefungsanmeldung_pruefungstermin_id'"))
+{
+	if($db->db_num_rows($result)==0)
+	{
+		$qry = 'ALTER TABLE campus.tbl_pruefungsanmeldung ADD CONSTRAINT fk_pruefungsanmeldung_pruefungstermin_id FOREIGN KEY (pruefungstermin_id) REFERENCES campus.tbl_pruefungstermin(pruefungstermin_id) ON DELETE RESTRICT ON UPDATE CASCADE;';
+		
+	
+		if(!$db->db_query($qry))
+			echo '<strong>campus.tbl_pruefungsanmeldung: '.$db->db_last_error().'</strong><br>';
+		else
+			echo 'campus.tbl_pruefungsanmeldung: Fehlenden Foreign Key zu Pruefungstermin hinzugefügt';
+	}
+}
+// Ampel boolean email
+if(!$result = @$db->db_query("SELECT ort_kurzbz FROM campus.tbl_pruefungstermin"))
+{
+	$qry = "ALTER TABLE campus.tbl_pruefungstermin ADD COLUMN ort_kurzbz varchar(16);
+	ALTER TABLE campus.tbl_pruefungstermin ADD CONSTRAINT fk_pruefungstermin_ort_ort_kurzbz FOREIGN KEY (ort_kurzbz) REFERENCES public.tbl_ort(ort_kurzbz) ON DELETE RESTRICT ON UPDATE CASCADE;";
+
+	if(!$db->db_query($qry))
+		echo '<strong>campus.tbl_pruefungstermin: '.$db->db_last_error().'</strong><br>';
+	else
+		echo 'campus.tbl_pruefungstermin: Neue Spalte ort_kurzbz hinzugefügt';
+}
+
+
+
 echo '<br><br><br>';
 
 $tabellen=array(
@@ -1598,7 +1683,7 @@ $tabellen=array(
 	"campus.tbl_paabgabe"  => array("paabgabe_id","projektarbeit_id","paabgabetyp_kurzbz","fixtermin","datum","kurzbz","abgabedatum", "insertvon","insertamum","updatevon","updateamum"),
 	"campus.tbl_pruefungsfenster" => array("pruefungsfenster_id","studiensemester_kurzbz","oe_kurzbz","start","ende"),
 	"campus.tbl_pruefung" => array("pruefung_id","mitarbeiter_uid","studiensemester_kurzbz","pruefungsfenster_id","pruefungstyp_kurzbz","titel","beschreibung","methode","einzeln","storniert","insertvon","insertamum","updatevon","updateamum"),
-	"campus.tbl_pruefungstermin" => array("pruefungstermin_id","pruefung_id","von","bis","teilnehmer_max","teilnehmer_min","anmeldung_von","anmeldung_bis"),
+	"campus.tbl_pruefungstermin" => array("pruefungstermin_id","pruefung_id","von","bis","teilnehmer_max","teilnehmer_min","anmeldung_von","anmeldung_bis","ort_kurzbz"),
 	"campus.tbl_pruefungsanmeldung" => array("pruefungsanmeldung_id","uid","pruefungstermin_id","lehrveranstaltung_id","status_kurzbz","wuensche","reihung","kommentar"),
 	"campus.tbl_pruefungsstatus" => array("status_kurzbz","bezeichnung"),
 	"campus.tbl_reservierung"  => array("reservierung_id","ort_kurzbz","studiengang_kz","uid","stunde","datum","titel","beschreibung","semester","verband","gruppe","gruppe_kurzbz","veranstaltung_id","insertamum","insertvon"),
@@ -1667,7 +1752,7 @@ $tabellen=array(
 	"lehre.tbl_zeugnisnote"  => array("lehrveranstaltung_id","student_uid","studiensemester_kurzbz","note","uebernahmedatum","benotungsdatum","bemerkung","updateamum","updatevon","insertamum","insertvon","ext_id"),
 	"public.tbl_adresse"  => array("adresse_id","person_id","name","strasse","plz","ort","gemeinde","nation","typ","heimatadresse","zustelladresse","firma_id","updateamum","updatevon","insertamum","insertvon","ext_id"),
 	"public.tbl_akte"  => array("akte_id","person_id","dokument_kurzbz","uid","inhalt","mimetype","erstelltam","gedruckt","titel","bezeichnung","updateamum","updatevon","insertamum","insertvon","ext_id","dms_id","nachgereicht","anmerkung","titel_intern","anmerkung_intern"),
-	"public.tbl_ampel"  => array("ampel_id","kurzbz","beschreibung","benutzer_select","deadline","vorlaufzeit","verfallszeit","insertamum","insertvon","updateamum","updatevon"),
+	"public.tbl_ampel"  => array("ampel_id","kurzbz","beschreibung","benutzer_select","deadline","vorlaufzeit","verfallszeit","insertamum","insertvon","updateamum","updatevon","email"),
 	"public.tbl_ampel_benutzer_bestaetigt"  => array("ampel_benutzer_bestaetigt_id","ampel_id","uid","insertamum","insertvon"),
 	"public.tbl_aufmerksamdurch"  => array("aufmerksamdurch_kurzbz","beschreibung","ext_id"),
 	"public.tbl_aufnahmeschluessel"  => array("aufnahmeschluessel"),