Merge branch 'current_development' into development_preview

# Conflicts:
#	id/history.txt
#	id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
#	pom.xml

3 files changed, 501 insertions, 0 deletions

diff --git a/id/server/doc/handbook_v4/common/LogoEGIZ.png b/id/server/doc/handbook_v4/common/LogoEGIZ.png
new file mode 100644
index 000000000..39f05d131
--- /dev/null
+++ b/id/server/doc/handbook_v4/common/LogoEGIZ.png
diff --git a/id/server/doc/handbook_v4/common/MOA.css b/id/server/doc/handbook_v4/common/MOA.css
new file mode 100644
index 000000000..f8fd01d8c
--- /dev/null
+++ b/id/server/doc/handbook_v4/common/MOA.css
@@ -0,0 +1,501 @@
+.container {
+	margin: auto;
+	max-width: 1000px;
+	padding-left: 20px;
+	padding-right: 20px;
+}
+
+body
+{ 
+  font-family: "Roboto", sans-serif;
+
+  color: #000;
+  font-size: medium;
+  font-weight: 300;
+  margin-left: 0px;
+  margin-right: 0px;
+  margin-top: 0px;
+  background-color: white;
+  letter-spacing: 0.05em;
+
+}
+
+b{
+  font-weight: 500;   
+}
+
+p
+{ 
+  margin-top: 0pt;
+  margin-bottom: 0.5em;
+  text-align: justify;
+
+}
+
+.centeredimage{
+    text-align: center;
+    width:100%;
+}
+
+.index{
+    padding-left: 0;   
+}
+.index a{
+    color: #666;
+}
+.index a:hover
+{
+    color:#E10319;  
+}
+.index ul{
+    list-style-type: none;
+}
+.index li{
+    list-style-type: none;
+}
+
+td{
+ font-weight: 300;   
+}
+
+
+
+pre 
+{ 
+  font-family: "Courier New", monospace;
+  font-size: 90%;
+  background-color: #DDD;
+  color: #000000;
+  margin-left:1.5%;
+  margin-right:1.5%;
+  margin-top: 1em;
+  margin-bottom: 1em;
+  border: #008000 none;
+  white-space: pre-wrap;
+}
+
+hr 
+{
+  color: #000080;
+  background-color: #000080;
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
+}
+
+table.fixedWidth
+{
+  width: 97%;
+  margin-left:1.5%;
+  margin-right:1.5%;
+  margin-top: 1em;
+  margin-bottom: 1em;
+  color:#404040;
+}
+table.varWidth
+{
+  margin-left:1.5%;
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+table.configtable{
+    width:100%;
+    border-collapse: collapse;
+    border-style:solid;
+    border-color: #404040;
+    border-width: 2px;
+    font-family: "Roboto",sans-serif
+}
+table.configtable th{
+    border-style:solid;
+    border-color: #404040;
+    border-width: 2px;
+    padding:3px;
+}
+table.configtable th{
+    font-weight: 300;  
+    font-size: 120%;
+}
+table.configtable td{
+    border-style:solid;
+    border-color: #404040;
+    border-width: 1px;
+    border-left-width: 2px;
+    border-right-width: 2px;
+    padding:3px;
+    font-weight: 300;
+}
+
+
+th
+{
+  text-align: left;
+  
+}
+
+h1
+{
+  font-size: 220%;
+  font-weight: 400;
+}
+
+h2
+{ 
+  letter-spacing: 1px;
+  font-size: 170%;
+  font-weight: 300;
+    
+}
+
+h3
+{ 
+  letter-spacing: 1px;
+  font-size: 160%;
+  font-weight: 300;
+}
+
+h4
+{
+  letter-spacing: 1px;
+  font-size: 150%;
+  font-weight: 300;
+
+}
+
+h5
+{ 
+  letter-spacing: 1px;
+  font-size: 140%;
+  font-weight: 300;
+}
+
+h6
+{ 
+  letter-spacing: 1px;
+  font-size: 130%;
+  font-weight: 300;
+}
+
+code
+{
+  font-family: "Roboto","Courier New", Courier, monospace;
+  font-size: 90%;
+  font-weight: 400;
+  color: #000000;
+}
+
+dd
+{
+  margin-top: 0.8em;
+  margin-bottom: 0.8em;
+  text-align: justify;
+
+}
+
+dt 
+{
+  margin-top: 0.8em;
+  color: #E10319;
+}
+dt a{
+    text-decoration:none;
+}
+
+ol
+{
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
+  padding-left:0.8em;
+}
+
+ol.alpha
+{
+  list-style-type: lower-alpha
+}
+
+li
+{
+  margin-top: 0.25em;
+  margin-bottom: 0.25em;
+  text-align: justify;
+}
+
+a:hover
+{
+    color: #E10319;
+}
+a{
+    color: #666;
+    text-decoration: none;
+}
+
+
+.title
+{
+  text-align: left;
+  font-size: 200%;
+  color: #000000;
+  font-family: "Roboto", sans-serif;
+  margin-top: 0.4em;
+  margin-bottom: 0.4em;
+}
+
+.subtitle 
+{  
+  text-align: left;
+  font-size: 133%;
+  color: #000000;
+  font-family: "Roboto", sans-serif;
+  margin-top: 0.4em;
+  margin-bottom: 0.4em
+}
+
+.glossaryTerm 
+{  
+  font-style: italic;
+  color: #006699
+}
+
+.example
+{ 
+  font-family: "Roboto", sans-serif;
+  background-color: #CCFFFF;
+  color: #000000;
+  margin: 0pt 0pt;
+  border: #008000 none
+}
+
+.schema
+{ 
+  font-family: "Courier New", monospace;
+  background-color: #FFFFCC;
+  color: #000000;
+  margin: 0pt 0pt;
+  border: #008000 none
+}
+
+.documentinfo
+{
+  font-family: "Roboto", sans-serif;
+  font-size: 100%;
+}
+
+.ol-contents
+{
+  font-size: 100%;
+  margin-top: 0.0em;
+  margin-bottom: 0.0em;
+}
+
+.li-contents
+{
+  font-size: 100%;
+  margin-top: 0.0em;
+  margin-bottom: 0.0em;
+}
+
+.logoTitle 
+{ 
+  text-align: center;
+  font-size: 200%;
+}
+
+.logoTable 
+{ 
+  margin-bottom: 0px;
+  margin-left: 0px;
+  background: linear-gradient(#FAFAFA, #F5F5F5);
+  border-bottom: 1px solid #EEE;
+  border-color: #818286;
+
+}
+
+.superscript
+{
+  vertical-align: super;
+  font-size: 66%;
+}
+
+.term
+{ 
+  font-style: italic; 
+}
+
+.strongerterm
+{ 
+  font-style: italic;
+  font-weight: 500; 
+}
+
+
+.comment
+{
+  color: #000000;
+  background: #ffff00;
+  font-style: italic
+}
+
+.addedErrata12
+{  
+  color: #FF0000; 
+  background-color: #FFEEEE;
+  text-decoration: underline
+}
+
+.deletedErrata12
+{
+  color: #999999;
+  background-color: #EEEEEE;
+  text-decoration: line-through
+}
+
+.added12
+{  
+  color: #FF0000; 
+  text-decoration: underline;
+ background-color: #F8F0FF;
+}
+
+.deleted12
+{
+  color: #999999;
+  text-decoration: line-through
+; background-color: #f8f0ff
+}
+
+.rfc2119Keyword 
+{ 
+  font-variant: small-caps;
+  font-style: normal;
+}
+
+.remark {  font-style: italic}
+
+li.faq
+{
+  margin-top: 1.5em;
+  margin-bottom: 1.5em;
+}
+
+.faq-question
+{ 
+  color: #000080;
+  font-size: 100%;
+  font-family: "Roboto", sans-serif;
+  font-weight: 300;
+  margin-bottom: 0.4em;
+}
+/*********************************/
+@media ( min-width :600px) {
+    #headline {
+	/*background: linear-gradient(center top , #FAFAFA, #F5F5F5) repeat scroll 0% 0% transparent;*/
+	background: linear-gradient(#FAFAFA, #F5F5F5);
+	border-bottom: 1px solid #EEE;
+
+    }
+	#headline br {
+		clear: both;
+	}
+
+	#headline h1 {
+		color: #404040;
+		padding-right: 1em;
+		padding-top: 0.15em;
+		margin-bottom: 0;
+		float: right;
+	}
+    #headline img {
+        width: 300px;
+        padding-left: 0;
+        padding-top: 35px;
+        padding-bottom:20px;
+    }
+    
+    .smallImgDiv{
+        width:50%; 
+        margin:auto;
+        margin-bottom:40px;
+        margin-top:20px;
+    }
+    .smallImgDiv img{
+        max-width: 100%;
+        max-height: 100%;
+        margin:auto;
+        display: block;
+    }
+    .largeImgDiv{
+        width:100%;
+        margin: auto;
+        margin-bottom:40px;
+        margin-top:20px;
+    }
+    .largeImgDiv img{
+        max-width: 100%;
+        max-height: 100%;
+        margin:auto;
+        display: block;
+    }
+}
+/*****************************/
+@media ( max-width :599px) {
+    #headline {
+        /*background: linear-gradient(center top , #FAFAFA, #F5F5F5) repeat scroll 0% 0% transparent;*/
+        background: linear-gradient(#FAFAFA, #F5F5F5);
+        border-bottom: 1px solid #EEE;
+    }   
+
+    #headline img {
+        width: 150px;
+        padding-left: 0;
+        padding-top: 0.5em;
+        padding-bottom:0.5em;
+    }
+    #headline br {
+        clear: both;
+    }
+    #demologin {
+        width: 100%;
+        box-sizing: border-box;
+        border: 1px solid;
+        border-radius: 1px;
+        border-color: #818286;
+        background: #F5F5F5;
+        height: 182px;
+        width: 242px;
+        margin-top: 18px;
+        padding-left:0;
+    }
+        #headline h1 {
+        color: #404040;
+        padding: 0;
+        margin-bottom: 0;
+        margin-top: 0;
+        text-align: center;
+    }
+    .smallImgDiv{
+        width:100%; 
+        margin:auto;
+        margin-bottom:40px;
+        margin-top:20px;
+    }
+    .smallImgDiv img{
+        max-width: 100%;
+        max-height: 100%;
+        margin:auto;
+        display: block;
+    }
+    .largeImgDiv{
+        width:100%;
+        margin: auto;
+        margin-bottom:40px;
+        margin-top:20px;
+    }
+    .largeImgDiv img{
+        max-width: 100%;
+        max-height: 100%;
+        margin:auto;
+        display: block;
+    }
+}
+
+
diff --git a/id/server/doc/handbook_v4/common/logo_digAT.png b/id/server/doc/handbook_v4/common/logo_digAT.png
new file mode 100644
index 000000000..4f36681e2
--- /dev/null
+++ b/id/server/doc/handbook_v4/common/logo_digAT.png