diff --git a/plan.html b/plan.html
index 4e3f15a..4a6901c 100644
--- a/plan.html
+++ b/plan.html
@@ -1345,7 +1345,7 @@ th.gantt-day-header {
- 3d
+ 6d
|
@@ -1375,11 +1375,24 @@ th.gantt-day-header {
+
+ 8.3
+ |
+
+
+ Updaten
+
+ |
+
+ 3d
+ |
+
+
9
|
-
+
Mastertestplan
|
@@ -1387,12 +1400,12 @@ th.gantt-day-header {
3d 6h
-
+
9.1
|
-
+
Anlegen und Beginnen
|
@@ -1400,12 +1413,12 @@ th.gantt-day-header {
1d 4h
-
+
9.2
|
-
+
Ausarbeiten
|
@@ -1413,12 +1426,12 @@ th.gantt-day-header {
2d 2h
-
+
10
|
-
+
Systemtests
|
@@ -1426,12 +1439,12 @@ th.gantt-day-header {
6d
-
+
10.1
|
-
+
Recherche: Teststategie für Webapps
|
@@ -1439,12 +1452,12 @@ th.gantt-day-header {
1d 4h
-
+
10.2
|
-
+
Systemtest vorbereiten
|
@@ -1452,12 +1465,12 @@ th.gantt-day-header {
1d 4h
-
+
10.3
|
-
+
Systemtest fertigstellen
|
@@ -1465,12 +1478,12 @@ th.gantt-day-header {
3d
-
+
11
|
-
+
Grobdesign + Feindesign
|
@@ -1478,12 +1491,12 @@ th.gantt-day-header {
37d
-
+
11.1
|
-
+
Grobes Datenschema
|
@@ -1491,12 +1504,12 @@ th.gantt-day-header {
1d 4h
-
+
11.2
|
-
+
Datenbank Design I
|
@@ -1504,12 +1517,12 @@ th.gantt-day-header {
6h
-
+
11.3
|
-
+
Datenbank Design II
|
@@ -1517,12 +1530,12 @@ th.gantt-day-header {
3d 6h
-
+
11.4
|
-
+
Ergänzungen Datenbankschema
|
@@ -1530,12 +1543,12 @@ th.gantt-day-header {
3h
-
+
11.5
|
-
+
Architekturmetting Kickoff
|
@@ -1543,12 +1556,12 @@ th.gantt-day-header {
1d
-
+
11.6
|
-
+
Feindesign Sendungsverfolgung
|
@@ -1556,12 +1569,12 @@ th.gantt-day-header {
3d 7h
-
+
11.7
|
-
+
Feindesign Lieferanten
|
@@ -1569,12 +1582,12 @@ th.gantt-day-header {
3d 7h
-
+
11.8
|
-
+
Modulaufteilung
|
@@ -1582,12 +1595,12 @@ th.gantt-day-header {
1d 3h
-
+
11.8.1
|
-
+
Grobdesign Modulaufteilung
|
@@ -1595,12 +1608,12 @@ th.gantt-day-header {
5h
-
+
11.8.2
|
-
+
Udpate bezüglich Actions & Controller
|
@@ -1608,12 +1621,12 @@ th.gantt-day-header {
6h
-
+
11.9
|
-
+
Feindesign Login System (mit Prototyp)
|
@@ -1621,12 +1634,12 @@ th.gantt-day-header {
2d
-
+
11.10
|
-
+
Feindesign Konfigurationsmanagement
|
@@ -1634,12 +1647,12 @@ th.gantt-day-header {
2d 6h
-
+
11.11
|
-
+
Feindesign Artikelverwaltung
|
@@ -1647,12 +1660,12 @@ th.gantt-day-header {
2d 6h
-
+
11.12
|
-
+
Feindesign Cronjobs
|
@@ -1660,12 +1673,12 @@ th.gantt-day-header {
1d
-
+
11.13
|
-
+
Konzept zu Integrationstests
|
@@ -1673,12 +1686,12 @@ th.gantt-day-header {
1d 4h
-
+
11.14
|
-
+
Konzept zu Suche
|
@@ -1686,12 +1699,12 @@ th.gantt-day-header {
6h
-
+
11.15
|
-
+
Feindesign Actions und Controller
|
@@ -1699,12 +1712,12 @@ th.gantt-day-header {
9d 5h
-
+
11.15.1
|
-
+
Vorbereitung + Warehouse
|
@@ -1712,12 +1725,12 @@ th.gantt-day-header {
1d 5h
-
+
11.15.2
|
-
+
Login, Shop, Checkout
|
@@ -1725,12 +1738,12 @@ th.gantt-day-header {
1d 5h
-
+
11.15.3
|
-
+
Artikel im Shop + Suche + Intern Buchungen
|
@@ -1738,12 +1751,12 @@ th.gantt-day-header {
1d 4h
-
+
11.15.4
|
-
+
Intern Lieferanten + Intern Artikel
|
@@ -1751,12 +1764,12 @@ th.gantt-day-header {
1d 5h
-
+
11.15.5
|
-
+
Nachbestellen + Cronjiobs
|
@@ -1764,12 +1777,12 @@ th.gantt-day-header {
6h
-
+
11.15.6
|
-
+
Intern Nutzerverwaltung + Nutzereinstellungen
|
@@ -1777,12 +1790,12 @@ th.gantt-day-header {
1d 5h
-
+
11.15.7
|
-
+
Überarbeitung
|
@@ -1790,12 +1803,12 @@ th.gantt-day-header {
6h
-
+
12
|
-
+
Integrationstests
|
@@ -1803,25 +1816,25 @@ th.gantt-day-header {
4d 2h
-
+
13
|
-
+
Implementierung
|
- 23d 7h
+ 26d 1h
|
-
+
13.1
|
-
+
DB Strukturen Anlegen und Überarbeiten
|
@@ -1829,12 +1842,12 @@ th.gantt-day-header {
5h
-
+
13.2
|
-
+
Packages und Controller anlegen
|
@@ -1842,12 +1855,12 @@ th.gantt-day-header {
6h
-
+
13.3
|
-
+
Design Datenbank Index - Meeting + Ergänzung
|
@@ -1855,12 +1868,12 @@ th.gantt-day-header {
6h
-
+
13.4
|
-
+
Checkout
|
@@ -1868,12 +1881,12 @@ th.gantt-day-header {
6h
-
+
13.5
|
-
+
Articles + Startpage
|
@@ -1881,25 +1894,25 @@ th.gantt-day-header {
1d 4h
-
+
13.6
|
-
+
Artikel hinzufügen (Intern)
|
- 6h
+ 2d 2h
|
-
+
13.7
|
-
+
Lieferanten Service
|
@@ -1907,38 +1920,38 @@ th.gantt-day-header {
1d 4h
-
+
13.8
|
-
+
Cron + Autonachbestellen
|
- 1d 4h
- |
-
-
-
- 13.9
- |
-
-
- Code Review + Hilfestellung
-
- |
-
- 3d
+ 2d 2h
|
- 13.10
+ 13.9
|
+ Code Review + Hilfestellung
+
+ |
+
+ 3d 6h
+ |
+
+
+
+ 13.10
+ |
+
+
Login überarbeiten + CSFR
|
@@ -1946,12 +1959,12 @@ th.gantt-day-header {
6h
-
+
13.11
|
-
+
Suche
|
@@ -1959,103 +1972,103 @@ th.gantt-day-header {
6h
+
+
+ 13.12
+ |
+
+
+ Intern Warehouse
+
+ |
+
+ 1d 4h
+ |
+
+
+
+ 13.13
+ |
+
+
+ Intern Buchungen
+
+ |
+
+ 1d 4h
+ |
+
+
+
+ 13.14
+ |
+
+
+ Customer + Order
+
+ |
+
+ 1d 4h
+ |
+
+
+
+ 13.15
+ |
+
+
+ Supplier + Order
+
+ |
+
+ 1d 4h
+ |
+
+
+
+ 13.16
+ |
+
+
+ Nutzersettings
+
+ |
+
+ 2d 2h
+ |
+
+
+
+ 13.17
+ |
+
+
+ Dashboard
+
+ |
+
+ 1d 4h
+ |
+
+
+
+ 13.18
+ |
+
+
+ Sendungsverfolgung
+
+ |
+
+ 6h
+ |
+
-
- 13.12
- |
-
-
- Intern Warehouse
-
- |
-
- 1d 4h
- |
-
-
-
- 13.13
- |
-
-
- Intern Buchungen
-
- |
-
- 1d 4h
- |
-
-
-
- 13.14
- |
-
-
- Customer + Order
-
- |
-
- 1d 4h
- |
-
-
-
- 13.15
- |
-
-
- Supplier + Order
-
- |
-
- 1d 4h
- |
-
-
-
- 13.16
- |
-
-
- Nutzersettings
-
- |
-
- 2d 2h
- |
-
-
-
- 13.17
- |
-
-
- Dashboard
-
- |
-
- 1d 4h
- |
-
-
-
- 13.18
- |
-
-
- Sendungsverfolgung
-
- |
-
- 1d 4h
- |
-
-
14
|
-
+
Orga
|
@@ -2063,12 +2076,12 @@ th.gantt-day-header {
1d 7h
-
+
14.1
|
-
+
Infrastruktur und Wiki einrichten
|
@@ -2076,12 +2089,12 @@ th.gantt-day-header {
3h
-
+
14.2
|
-
+
Templates anlegen für Google Doc
|
@@ -2089,25 +2102,25 @@ th.gantt-day-header {
3h
+
+
+ 14.3
+ |
+
+
+ Recherche zu Code Formatter
+
+ |
+
+ 3h
+ |
+
-
- 14.3
- |
-
-
- Recherche zu Code Formatter
-
- |
-
- 3h
- |
-
-
14.4
|
-
+
Anpassung durch Streichung
|
@@ -3259,10 +3272,22 @@ th.gantt-day-header {
-
+
|
+
+
+ |
+
+
@@ -3274,7 +3299,7 @@ th.gantt-day-header {
|
-
+
@@ -3286,12 +3311,12 @@ th.gantt-day-header {
|
-
+
|
-
+
@@ -3303,7 +3328,7 @@ th.gantt-day-header {
|
-
+
@@ -3315,7 +3340,7 @@ th.gantt-day-header {
|
-
+
@@ -3327,12 +3352,12 @@ th.gantt-day-header {
|
-
+
|
-
+
@@ -3344,7 +3369,7 @@ th.gantt-day-header {
|
-
+
@@ -3356,7 +3381,7 @@ th.gantt-day-header {
|
-
+
@@ -3368,7 +3393,7 @@ th.gantt-day-header {
|
-
+
@@ -3380,7 +3405,7 @@ th.gantt-day-header {
|
-
+
@@ -3392,18 +3417,6 @@ th.gantt-day-header {
|
-
-
-
-
-
-
- Hannes[45], Phillip[50], Jannik[50]
-
- |
-
@@ -3417,11 +3430,23 @@ th.gantt-day-header {
|
+
+
+
+
+
+ Hannes[45], Phillip[50], Jannik[50]
+
+ |
+
+
|
-
+
@@ -3433,7 +3458,7 @@ th.gantt-day-header {
|
-
+
@@ -3445,7 +3470,7 @@ th.gantt-day-header {
|
-
+
@@ -3457,7 +3482,7 @@ th.gantt-day-header {
|
-
+
@@ -3469,7 +3494,7 @@ th.gantt-day-header {
|
-
+
@@ -3481,7 +3506,7 @@ th.gantt-day-header {
|
-
+
@@ -3493,7 +3518,7 @@ th.gantt-day-header {
|
-
+
@@ -3505,7 +3530,7 @@ th.gantt-day-header {
|
-
+
@@ -3517,12 +3542,12 @@ th.gantt-day-header {
|
-
+
|
-
+
@@ -3534,7 +3559,7 @@ th.gantt-day-header {
|
-
+
@@ -3546,7 +3571,7 @@ th.gantt-day-header {
|
-
+
@@ -3558,7 +3583,7 @@ th.gantt-day-header {
|
-
+
@@ -3570,7 +3595,7 @@ th.gantt-day-header {
|
-
+
@@ -3582,7 +3607,7 @@ th.gantt-day-header {
|
-
+
@@ -3594,7 +3619,7 @@ th.gantt-day-header {
|
-
+
@@ -3606,7 +3631,7 @@ th.gantt-day-header {
|
-
+
@@ -3618,12 +3643,12 @@ th.gantt-day-header {
|
-
+
|
-
+
@@ -3635,7 +3660,7 @@ th.gantt-day-header {
|
-
+
@@ -3647,17 +3672,17 @@ th.gantt-day-header {
|
-
+
|
-
+
@@ -3669,12 +3694,138 @@ th.gantt-day-header {
|
-
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+
+
Hannes
@@ -3684,145 +3835,31 @@ th.gantt-day-header {
+ |
+
+
+
+
- |
-
-
-
-
|
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
|
-
+
@@ -3834,7 +3871,7 @@ th.gantt-day-header {
|
-
+
@@ -3846,7 +3883,7 @@ th.gantt-day-header {
|
-
+
@@ -3858,7 +3895,7 @@ th.gantt-day-header {
|
-
+
@@ -6083,10 +6120,10 @@ th.gantt-day-header {
Jan 22
|
- Mar 10
+ Jun 2
|
- 3d
+ 6d
|
|
@@ -6157,12 +6194,42 @@ th.gantt-day-header {
|
-
+
+
+ 8.3
+ |
+
+
+ Updaten
+
+ |
+
+ May 20
+ |
+
+ Jun 2
+ |
+
+ 3d
+ |
+
+ 15%
+
+ |
+
+
+ |
+ Danny, Phillip |
+
+
+ |
+
+
9
|
-
+
Mastertestplan
|
@@ -6184,12 +6251,12 @@ th.gantt-day-header {
-
+
9.1
|
-
+
Anlegen und Beginnen
|
@@ -6214,12 +6281,12 @@ th.gantt-day-header {
-
+
9.2
|
-
+
Ausarbeiten
|
@@ -6244,12 +6311,12 @@ th.gantt-day-header {
-
+
10
|
-
+
Systemtests
|
@@ -6271,12 +6338,12 @@ th.gantt-day-header {
-
+
10.1
|
-
+
Recherche: Teststategie für Webapps
|
@@ -6301,12 +6368,12 @@ th.gantt-day-header {
-
+
10.2
|
-
+
Systemtest vorbereiten
|
@@ -6331,12 +6398,12 @@ th.gantt-day-header {
-
+
10.3
|
-
+
Systemtest fertigstellen
|
@@ -6361,12 +6428,12 @@ th.gantt-day-header {
-
+
11
|
-
+
Grobdesign + Feindesign
|
@@ -6388,12 +6455,12 @@ th.gantt-day-header {
-
+
11.1
|
-
+
Grobes Datenschema
|
@@ -6418,12 +6485,12 @@ th.gantt-day-header {
-
+
11.2
|
-
+
Datenbank Design I
|
@@ -6448,12 +6515,12 @@ th.gantt-day-header {
-
+
11.3
|
-
+
Datenbank Design II
|
@@ -6478,12 +6545,12 @@ th.gantt-day-header {
-
+
11.4
|
-
+
Ergänzungen Datenbankschema
|
@@ -6508,12 +6575,12 @@ th.gantt-day-header {
-
+
11.5
|
-
+
Architekturmetting Kickoff
|
@@ -6538,12 +6605,12 @@ th.gantt-day-header {
-
+
11.6
|
-
+
Feindesign Sendungsverfolgung
|
@@ -6568,12 +6635,12 @@ th.gantt-day-header {
-
+
11.7
|
-
+
Feindesign Lieferanten
|
@@ -6598,12 +6665,12 @@ th.gantt-day-header {
-
+
11.8
|
-
+
Modulaufteilung
|
@@ -6625,12 +6692,12 @@ th.gantt-day-header {
-
+
11.8.1
|
-
+
Grobdesign Modulaufteilung
|
@@ -6655,12 +6722,12 @@ th.gantt-day-header {
-
+
11.8.2
|
-
+
Udpate bezüglich Actions & Controller
|
@@ -6685,12 +6752,12 @@ th.gantt-day-header {
-
+
11.9
|
-
+
Feindesign Login System (mit Prototyp)
|
@@ -6715,12 +6782,12 @@ th.gantt-day-header {
-
+
11.10
|
-
+
Feindesign Konfigurationsmanagement
|
@@ -6745,12 +6812,12 @@ th.gantt-day-header {
-
+
11.11
|
-
+
Feindesign Artikelverwaltung
|
@@ -6775,12 +6842,12 @@ th.gantt-day-header {
-
+
11.12
|
-
+
Feindesign Cronjobs
|
@@ -6805,12 +6872,12 @@ th.gantt-day-header {
-
+
11.13
|
-
+
Konzept zu Integrationstests
|
@@ -6835,12 +6902,12 @@ th.gantt-day-header {
-
+
11.14
|
-
+
Konzept zu Suche
|
@@ -6865,12 +6932,12 @@ th.gantt-day-header {
-
+
11.15
|
-
+
Feindesign Actions und Controller
|
@@ -6892,12 +6959,12 @@ th.gantt-day-header {
-
+
11.15.1
|
-
+
Vorbereitung + Warehouse
|
@@ -6922,12 +6989,12 @@ th.gantt-day-header {
-
+
11.15.2
|
-
+
Login, Shop, Checkout
|
@@ -6952,12 +7019,12 @@ th.gantt-day-header {
-
+
11.15.3
|
-
+
Artikel im Shop + Suche + Intern Buchungen
|
@@ -6982,12 +7049,12 @@ th.gantt-day-header {
-
+
11.15.4
|
-
+
Intern Lieferanten + Intern Artikel
|
@@ -7012,12 +7079,12 @@ th.gantt-day-header {
-
+
11.15.5
|
-
+
Nachbestellen + Cronjiobs
|
@@ -7042,12 +7109,12 @@ th.gantt-day-header {
-
+
11.15.6
|
-
+
Intern Nutzerverwaltung + Nutzereinstellungen
|
@@ -7072,12 +7139,12 @@ th.gantt-day-header {
-
+
11.15.7
|
-
+
Überarbeitung
|
@@ -7102,12 +7169,12 @@ th.gantt-day-header {
-
+
12
|
-
+
Integrationstests
|
@@ -7132,12 +7199,12 @@ th.gantt-day-header {
-
+
13
|
-
+
Implementierung
|
@@ -7148,7 +7215,7 @@ th.gantt-day-header {
Jun 16
- 23d 7h
+ 26d 1h
|
|
@@ -7159,12 +7226,12 @@ th.gantt-day-header {
|
-
+
13.1
|
-
+
DB Strukturen Anlegen und Überarbeiten
|
@@ -7189,12 +7256,12 @@ th.gantt-day-header {
-
+
13.2
|
-
+
Packages und Controller anlegen
|
@@ -7219,20 +7286,20 @@ th.gantt-day-header {
-
+
13.3
|
-
+
Design Datenbank Index - Meeting + Ergänzung
|
- May 20
+ Jun 10
|
- May 26
+ Jun 16
|
6h
@@ -7249,12 +7316,12 @@ th.gantt-day-header {
|
-
+
13.4
|
-
+
Checkout
|
@@ -7279,12 +7346,12 @@ th.gantt-day-header {
-
+
13.5
|
-
+
Articles + Startpage
|
@@ -7298,7 +7365,7 @@ th.gantt-day-header {
1d 4h
- 75%
+ 100%
|
@@ -7309,12 +7376,12 @@ th.gantt-day-header {
|
-
+
13.6
|
-
+
Artikel hinzufügen (Intern)
|
@@ -7322,13 +7389,13 @@ th.gantt-day-header {
May 6
- May 12
+ May 26
|
- 6h
+ 2d 2h
|
- 25%
+ 75%
|
@@ -7339,12 +7406,12 @@ th.gantt-day-header {
|
-
+
13.7
|
-
+
Lieferanten Service
|
@@ -7358,7 +7425,7 @@ th.gantt-day-header {
1d 4h
- 0%
+ 100%
|
@@ -7369,12 +7436,12 @@ th.gantt-day-header {
|
-
+
13.8
|
-
+
Cron + Autonachbestellen
|
@@ -7382,13 +7449,13 @@ th.gantt-day-header {
May 6
- May 19
+ May 26
|
- 1d 4h
+ 2d 2h
|
- 10%
+ 70%
|
@@ -7399,12 +7466,12 @@ th.gantt-day-header {
|
-
+
13.9
|
-
+
Code Review + Hilfestellung
|
@@ -7412,10 +7479,10 @@ th.gantt-day-header {
Apr 29
- May 26
+ Jun 2
|
- 3d
+ 3d 6h
|
75%
@@ -7429,42 +7496,42 @@ th.gantt-day-header {
|
-
+
13.10
|
-
+
Login überarbeiten + CSFR
|
- May 20
+ May 13
|
- May 26
+ May 19
|
6h
|
- 0%
+ 100%
|
|
- |
+ Danny |
|
-
+
13.11
|
-
+
Suche
|
@@ -7478,54 +7545,24 @@ th.gantt-day-header {
6h
- 0%
+ 100%
|
|
- |
+ Hannes |
|
-
+
13.12
|
-
-
- Intern Warehouse
-
- |
-
- May 13
- |
-
- May 26
- |
-
- 1d 4h
- |
-
- 0%
-
- |
-
-
- |
- |
-
-
- |
-
-
-
- 13.13
- |
- Intern Buchungen
+ Intern Warehouse
|
@@ -7538,31 +7575,31 @@ th.gantt-day-header {
1d 4h
|
- 0%
+ 10%
|
|
- |
+ Robin |
|
- 13.14
+ 13.13
|
- Customer + Order
+ Intern Buchungen
|
- May 20
+ Jun 3
|
- Jun 2
+ Jun 16
|
1d 4h
@@ -7581,11 +7618,11 @@ th.gantt-day-header {
|
- 13.15
+ 13.14
|
- Supplier + Order
+ Customer + Order
|
@@ -7611,21 +7648,21 @@ th.gantt-day-header {
|
- 13.16
+ 13.15
|
- Nutzersettings
+ Supplier + Order
|
May 27
|
- Jun 16
+ Jun 9
|
- 2d 2h
+ 1d 4h
|
0%
@@ -7641,10 +7678,40 @@ th.gantt-day-header {
|
- 13.17
+ 13.16
|
+ Nutzersettings
+
+ |
+
+ May 20
+ |
+
+ Jun 9
+ |
+
+ 2d 2h
+ |
+
+ 25%
+
+ |
+
+
+ |
+ Hannes |
+
+
+ |
+
+
+
+ 13.17
+ |
+
+
Dashboard
|
@@ -7669,42 +7736,42 @@ th.gantt-day-header {
-
+
13.18
|
-
+
Sendungsverfolgung
|
- Jun 3
+ May 13
|
- Jun 16
+ May 19
|
- 1d 4h
+ 6h
|
- 0%
+ 100%
|
|
- |
+ Phillip |
|
-
+
14
|
-
+
Orga
|
@@ -7726,12 +7793,12 @@ th.gantt-day-header {
-
+
14.1
|
-
+
Infrastruktur und Wiki einrichten
|
@@ -7756,12 +7823,12 @@ th.gantt-day-header {
-
+
14.2
|
-
+
Templates anlegen für Google Doc
|
@@ -7786,12 +7853,12 @@ th.gantt-day-header {
-
+
14.3
|
-
+
Recherche zu Code Formatter
|
@@ -7816,12 +7883,12 @@ th.gantt-day-header {
-
+
14.4
|
-
+
Anpassung durch Streichung
|
diff --git a/plan.planner b/plan.planner
index 9be684b..c05bdd0 100644
--- a/plan.planner
+++ b/plan.planner
@@ -281,205 +281,208 @@
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
+
+
+
+
-
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
+
-
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+
-
+
@@ -495,13 +498,14 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -510,7 +514,7 @@
-
+
@@ -518,13 +522,15 @@
-
-
-
-
+
+
+
+
+
+
+
+
-
-
@@ -536,29 +542,29 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -572,44 +578,48 @@
-
-
-
-
+
+
+
+
+
+
+
-
-
+
-
-
+
+
-
-
+
+
+
+
+
-
-
+
-
+
-
-
-
+
+
+
+
+
-
-
|