Merge branch 'current_development' into development_preview

# Conflicts:
#	id/history.txt

43 files changed, 9 insertions, 2 deletions

diff --git a/id/server/doc/handbook/config/config.html b/id/server/doc/handbook/config/config.html
index 0b9f7e614..a67de86d0 100644
--- a/id/server/doc/handbook/config/config.html
+++ b/id/server/doc/handbook/config/config.html
@@ -1670,12 +1670,19 @@ Soll die Bürgerkartenauswahl weiterhin, wie in MOA-ID  1.5.1 im Kontext der
     <th width="50%">Beschreibung</th>
   </tr>
   <tr>
-    <td><span id="wwlbl_loadOA_targetConfig_eidDemoActive">E-ID aktivieren</span></td>
+    <td><span id="wwlbl_loadOA_targetConfig_eidDemoActive">E-ID Proxy-Mode aktivieren</span></td>
     <td><p>&nbsp;</p></td>
     <td align="center">&nbsp;</td>
     <td align="center">X</td>
     <td>Aktiviert die Weiterleitung an den E-ID f&uuml;r diese Online Applikation. </td>
   </tr>
+  <tr>
+    <td>E-ID Demo-Mode aktivieren</td>
+    <td>&nbsp;</td>
+    <td align="center">&nbsp;</td>
+    <td align="center">X</td>
+    <td>Aktiviert das angepasst E-ID Attributset f&uuml;r diese Online Applikation, es erfolgt jedoch KEINE Weiterleitung an den E-ID. </td>
+  </tr>
 </table>
 <p>&nbsp;</p>
 <h4><a name="konfigurationsparameter_oa_bku" id="uebersicht_zentraledatei_aktualisierung20"></a>3.2.3 BKU Konfiguration</h4>
diff --git a/id/server/doc/handbook/index.html b/id/server/doc/handbook/index.html
index 73ece89e3..80d2d3fe8 100644
--- a/id/server/doc/handbook/index.html
+++ b/id/server/doc/handbook/index.html
@@ -29,7 +29,7 @@
   </div>
 
 <div class="container">
-  <h2>&Uuml;bersicht zur Dokumentation der Version 3.4.x </h2>
+  <h2>&Uuml;bersicht zur Dokumentation der Version 4.1.x </h2>
   
   <dl>
     <dt><a href="./intro/intro.html">Einf&uuml;hrung</a></dt>
diff --git a/id/server/doc/handbook_v4/additional/additional.html b/id/server/doc/handbook_v40/additional/additional.html
index d7afc1961..d7afc1961 100644
--- a/id/server/doc/handbook_v4/additional/additional.html
+++ b/id/server/doc/handbook_v40/additional/additional.html
diff --git a/id/server/doc/handbook_v4/application/application.html b/id/server/doc/handbook_v40/application/application.html
index 60732acaf..60732acaf 100644
--- a/id/server/doc/handbook_v4/application/application.html
+++ b/id/server/doc/handbook_v40/application/application.html
diff --git a/id/server/doc/handbook_v4/application/iframe.png b/id/server/doc/handbook_v40/application/iframe.png
index dcc6a932d..dcc6a932d 100644
--- a/id/server/doc/handbook_v4/application/iframe.png
+++ b/id/server/doc/handbook_v40/application/iframe.png
diff --git a/id/server/doc/handbook_v4/application/login_button.PNG b/id/server/doc/handbook_v40/application/login_button.PNG
index 36d8921ce..36d8921ce 100644
--- a/id/server/doc/handbook_v4/application/login_button.PNG
+++ b/id/server/doc/handbook_v40/application/login_button.PNG
diff --git a/id/server/doc/handbook_v4/application/mainframe.PNG b/id/server/doc/handbook_v40/application/mainframe.PNG
index 0e597d3fc..0e597d3fc 100644
--- a/id/server/doc/handbook_v4/application/mainframe.PNG
+++ b/id/server/doc/handbook_v40/application/mainframe.PNG
diff --git a/id/server/doc/handbook_v4/application/sso_sendassertion.PNG b/id/server/doc/handbook_v40/application/sso_sendassertion.PNG
index 1a2ca6a67..1a2ca6a67 100644
--- a/id/server/doc/handbook_v4/application/sso_sendassertion.PNG
+++ b/id/server/doc/handbook_v40/application/sso_sendassertion.PNG
diff --git a/id/server/doc/handbook_v4/common/LogoEGIZ.png b/id/server/doc/handbook_v40/common/LogoEGIZ.png
index 39f05d131..39f05d131 100644
--- a/id/server/doc/handbook_v4/common/LogoEGIZ.png
+++ b/id/server/doc/handbook_v40/common/LogoEGIZ.png
diff --git a/id/server/doc/handbook_v4/common/MOA.css b/id/server/doc/handbook_v40/common/MOA.css
index f8fd01d8c..f8fd01d8c 100644
--- a/id/server/doc/handbook_v4/common/MOA.css
+++ b/id/server/doc/handbook_v40/common/MOA.css
diff --git a/id/server/doc/handbook_v4/common/logo_digAT.png b/id/server/doc/handbook_v40/common/logo_digAT.png
index 4f36681e2..4f36681e2 100644
--- a/id/server/doc/handbook_v4/common/logo_digAT.png
+++ b/id/server/doc/handbook_v40/common/logo_digAT.png
diff --git a/id/server/doc/handbook_v4/config/config.html b/id/server/doc/handbook_v40/config/config.html
index ad5592c54..ad5592c54 100644
--- a/id/server/doc/handbook_v4/config/config.html
+++ b/id/server/doc/handbook_v40/config/config.html
diff --git a/id/server/doc/handbook_v4/index.html b/id/server/doc/handbook_v40/index.html
index cd09a4704..cd09a4704 100644
--- a/id/server/doc/handbook_v4/index.html
+++ b/id/server/doc/handbook_v40/index.html
diff --git a/id/server/doc/handbook_v4/install/install.html b/id/server/doc/handbook_v40/install/install.html
index 6d11e0b72..6d11e0b72 100644
--- a/id/server/doc/handbook_v4/install/install.html
+++ b/id/server/doc/handbook_v40/install/install.html
diff --git a/id/server/doc/handbook_v4/intro/Blockdiagramm.png b/id/server/doc/handbook_v40/intro/Blockdiagramm.png
index 18d5b84a2..18d5b84a2 100644
--- a/id/server/doc/handbook_v4/intro/Blockdiagramm.png
+++ b/id/server/doc/handbook_v40/intro/Blockdiagramm.png
diff --git a/id/server/doc/handbook_v4/intro/E-ID-Proxy.png b/id/server/doc/handbook_v40/intro/E-ID-Proxy.png
index 2e7bb2896..2e7bb2896 100644
--- a/id/server/doc/handbook_v4/intro/E-ID-Proxy.png
+++ b/id/server/doc/handbook_v40/intro/E-ID-Proxy.png
diff --git a/id/server/doc/handbook_v4/intro/Gesamtarchitektur.png b/id/server/doc/handbook_v40/intro/Gesamtarchitektur.png
index 7735679bf..7735679bf 100644
--- a/id/server/doc/handbook_v4/intro/Gesamtarchitektur.png
+++ b/id/server/doc/handbook_v40/intro/Gesamtarchitektur.png
diff --git a/id/server/doc/handbook_v4/intro/anmeldeablauf.png b/id/server/doc/handbook_v40/intro/anmeldeablauf.png
index 59bdefe62..59bdefe62 100644
--- a/id/server/doc/handbook_v4/intro/anmeldeablauf.png
+++ b/id/server/doc/handbook_v40/intro/anmeldeablauf.png
diff --git a/id/server/doc/handbook_v4/intro/intro.html b/id/server/doc/handbook_v40/intro/intro.html
index a7a4a6357..a7a4a6357 100644
--- a/id/server/doc/handbook_v4/intro/intro.html
+++ b/id/server/doc/handbook_v40/intro/intro.html
diff --git a/id/server/doc/handbook_v4/moduledevinfo/ProcessDefinition.xsd b/id/server/doc/handbook_v40/moduledevinfo/ProcessDefinition.xsd
index d6ab7ae46..d6ab7ae46 100644
--- a/id/server/doc/handbook_v4/moduledevinfo/ProcessDefinition.xsd
+++ b/id/server/doc/handbook_v40/moduledevinfo/ProcessDefinition.xsd
diff --git a/id/server/doc/handbook_v4/moduledevinfo/moduledevinfo.html b/id/server/doc/handbook_v40/moduledevinfo/moduledevinfo.html
index 28e4f1bb4..28e4f1bb4 100644
--- a/id/server/doc/handbook_v4/moduledevinfo/moduledevinfo.html
+++ b/id/server/doc/handbook_v40/moduledevinfo/moduledevinfo.html
diff --git a/id/server/doc/handbook_v4/protocol/Assertion.xml b/id/server/doc/handbook_v40/protocol/Assertion.xml
index 2654f2e80..2654f2e80 100644
--- a/id/server/doc/handbook_v4/protocol/Assertion.xml
+++ b/id/server/doc/handbook_v40/protocol/Assertion.xml
diff --git a/id/server/doc/handbook_v4/protocol/AuthRequest.xml b/id/server/doc/handbook_v40/protocol/AuthRequest.xml
index f9de11c4c..f9de11c4c 100644
--- a/id/server/doc/handbook_v4/protocol/AuthRequest.xml
+++ b/id/server/doc/handbook_v40/protocol/AuthRequest.xml
diff --git a/id/server/doc/handbook_v4/protocol/idp_metadata.xml b/id/server/doc/handbook_v40/protocol/idp_metadata.xml
index ffc15d461..ffc15d461 100644
--- a/id/server/doc/handbook_v4/protocol/idp_metadata.xml
+++ b/id/server/doc/handbook_v40/protocol/idp_metadata.xml
diff --git a/id/server/doc/handbook_v4/protocol/openIDconnect_sequenz.png b/id/server/doc/handbook_v40/protocol/openIDconnect_sequenz.png
index 2faff33ed..2faff33ed 100644
--- a/id/server/doc/handbook_v4/protocol/openIDconnect_sequenz.png
+++ b/id/server/doc/handbook_v40/protocol/openIDconnect_sequenz.png
diff --git a/id/server/doc/handbook_v4/protocol/protocol.html b/id/server/doc/handbook_v40/protocol/protocol.html
index 73465d55b..73465d55b 100644
--- a/id/server/doc/handbook_v4/protocol/protocol.html
+++ b/id/server/doc/handbook_v40/protocol/protocol.html
diff --git a/id/server/doc/handbook_v4/protocol/pvp21_sequence.png b/id/server/doc/handbook_v40/protocol/pvp21_sequence.png
index c915531cc..c915531cc 100644
--- a/id/server/doc/handbook_v4/protocol/pvp21_sequence.png
+++ b/id/server/doc/handbook_v40/protocol/pvp21_sequence.png
diff --git a/id/server/doc/handbook_v4/protocol/saml1_sequence.png b/id/server/doc/handbook_v40/protocol/saml1_sequence.png
index e863d74c1..e863d74c1 100644
--- a/id/server/doc/handbook_v4/protocol/saml1_sequence.png
+++ b/id/server/doc/handbook_v40/protocol/saml1_sequence.png
diff --git a/id/server/doc/handbook_v4/protocol/serviceprovider_metadata.xml b/id/server/doc/handbook_v40/protocol/serviceprovider_metadata.xml
index 15e26469c..15e26469c 100644
--- a/id/server/doc/handbook_v4/protocol/serviceprovider_metadata.xml
+++ b/id/server/doc/handbook_v40/protocol/serviceprovider_metadata.xml
diff --git a/id/server/doc/handbook_v4/protocol/sso_sequence.png b/id/server/doc/handbook_v40/protocol/sso_sequence.png
index 19e50100d..19e50100d 100644
--- a/id/server/doc/handbook_v4/protocol/sso_sequence.png
+++ b/id/server/doc/handbook_v40/protocol/sso_sequence.png
diff --git a/id/server/doc/handbook_v4/spec/MOA ID 1.x.wsdl b/id/server/doc/handbook_v40/spec/MOA ID 1.x.wsdl
index d83556540..d83556540 100644
--- a/id/server/doc/handbook_v4/spec/MOA ID 1.x.wsdl
+++ b/id/server/doc/handbook_v40/spec/MOA ID 1.x.wsdl
diff --git a/id/server/doc/handbook_v4/spec/MOA-SPSS-1.3.pdf b/id/server/doc/handbook_v40/spec/MOA-SPSS-1.3.pdf
index 6709a4081..6709a4081 100644
--- a/id/server/doc/handbook_v4/spec/MOA-SPSS-1.3.pdf
+++ b/id/server/doc/handbook_v40/spec/MOA-SPSS-1.3.pdf
diff --git a/id/server/doc/handbook_v4/spec/MOA-SPSS-2.0.0.pdf b/id/server/doc/handbook_v40/spec/MOA-SPSS-2.0.0.pdf
index 1e65beca9..1e65beca9 100644
--- a/id/server/doc/handbook_v4/spec/MOA-SPSS-2.0.0.pdf
+++ b/id/server/doc/handbook_v40/spec/MOA-SPSS-2.0.0.pdf
diff --git a/id/server/doc/handbook_v4/spec/MOA-SPSS-2.0.0.wsdl b/id/server/doc/handbook_v40/spec/MOA-SPSS-2.0.0.wsdl
index 4f9deee38..4f9deee38 100644
--- a/id/server/doc/handbook_v4/spec/MOA-SPSS-2.0.0.wsdl
+++ b/id/server/doc/handbook_v40/spec/MOA-SPSS-2.0.0.wsdl
diff --git a/id/server/doc/handbook_v4/spec/MOA-SPSS-2.0.0.xsd b/id/server/doc/handbook_v40/spec/MOA-SPSS-2.0.0.xsd
index 73d145ecf..73d145ecf 100644
--- a/id/server/doc/handbook_v4/spec/MOA-SPSS-2.0.0.xsd
+++ b/id/server/doc/handbook_v40/spec/MOA-SPSS-2.0.0.xsd
diff --git a/id/server/doc/handbook_v4/spec/MOA_ID_1.2_20040315.pdf b/id/server/doc/handbook_v40/spec/MOA_ID_1.2_20040315.pdf
index 0c89c2730..0c89c2730 100644
--- a/id/server/doc/handbook_v4/spec/MOA_ID_1.2_20040315.pdf
+++ b/id/server/doc/handbook_v40/spec/MOA_ID_1.2_20040315.pdf
diff --git a/id/server/doc/handbook_v4/spec/MOA_ID_1.3_20060315.pdf b/id/server/doc/handbook_v40/spec/MOA_ID_1.3_20060315.pdf
index c9b0d160c..c9b0d160c 100644
--- a/id/server/doc/handbook_v4/spec/MOA_ID_1.3_20060315.pdf
+++ b/id/server/doc/handbook_v40/spec/MOA_ID_1.3_20060315.pdf
diff --git a/id/server/doc/handbook_v4/spec/MOA_ID_1.4_20070802.pdf b/id/server/doc/handbook_v40/spec/MOA_ID_1.4_20070802.pdf
index a3a2f1177..a3a2f1177 100644
--- a/id/server/doc/handbook_v4/spec/MOA_ID_1.4_20070802.pdf
+++ b/id/server/doc/handbook_v40/spec/MOA_ID_1.4_20070802.pdf
diff --git a/id/server/doc/handbook_v4/spec/MOA_ID_1.4_Anhang.pdf b/id/server/doc/handbook_v40/spec/MOA_ID_1.4_Anhang.pdf
index 0c923666f..0c923666f 100644
--- a/id/server/doc/handbook_v4/spec/MOA_ID_1.4_Anhang.pdf
+++ b/id/server/doc/handbook_v40/spec/MOA_ID_1.4_Anhang.pdf
diff --git a/id/server/doc/handbook_v4/spec/MOA_ID_1.5_Anhang.pdf b/id/server/doc/handbook_v40/spec/MOA_ID_1.5_Anhang.pdf
index ed2743d3c..ed2743d3c 100644
--- a/id/server/doc/handbook_v4/spec/MOA_ID_1.5_Anhang.pdf
+++ b/id/server/doc/handbook_v40/spec/MOA_ID_1.5_Anhang.pdf
diff --git a/id/server/doc/handbook_v4/spec/OID-1-0-3.pdf b/id/server/doc/handbook_v40/spec/OID-1-0-3.pdf
index 4beab3e41..4beab3e41 100644
--- a/id/server/doc/handbook_v4/spec/OID-1-0-3.pdf
+++ b/id/server/doc/handbook_v40/spec/OID-1-0-3.pdf
diff --git a/id/server/doc/handbook_v4/spec/cs-sstc-schema-assertion-01.xsd b/id/server/doc/handbook_v40/spec/cs-sstc-schema-assertion-01.xsd
index d41f3e817..d41f3e817 100644
--- a/id/server/doc/handbook_v4/spec/cs-sstc-schema-assertion-01.xsd
+++ b/id/server/doc/handbook_v40/spec/cs-sstc-schema-assertion-01.xsd
diff --git a/id/server/doc/handbook_v4/spec/cs-sstc-schema-protocol-01.xsd b/id/server/doc/handbook_v40/spec/cs-sstc-schema-protocol-01.xsd
index d939fa732..d939fa732 100644
--- a/id/server/doc/handbook_v4/spec/cs-sstc-schema-protocol-01.xsd
+++ b/id/server/doc/handbook_v40/spec/cs-sstc-schema-protocol-01.xsd