Merge STORK-SAML-Engine 1.5.1 and STORK-Commons 1.5.1

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
	id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
	id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java

1 files changed, 7 insertions, 7 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareUnmarshaller.java
index f7f00adb9..8e2f327c6 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareUnmarshaller.java
@@ -23,7 +23,6 @@ import org.w3c.dom.Element;
 
 import eu.stork.peps.auth.engine.core.EIDSectorShare;
 
-
 /**
  * The Class EIDSectorShareUnmarshaller.
  * 
@@ -31,16 +30,17 @@ import eu.stork.peps.auth.engine.core.EIDSectorShare;
  */
 public class EIDSectorShareUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
-
 	/**
 	 * Process element content.
 	 *
-	 * @param samlObject the SAML object
-	 * @param domElement the DOM element
-	 * @throws MarshallingException the marshalling exception
+	 * @param samlObject
+	 *            the SAML object
+	 * @param domElement
+	 *            the DOM element
+	 * @throws MarshallingException
+	 *             the marshalling exception
 	 */
-	protected final void processElementContent(final XMLObject samlObject,
-			final String domElement)  {
+	protected final void processElementContent(final XMLObject samlObject, final String domElement) {
 		final EIDSectorShare sectorShare = (EIDSectorShare) samlObject;
 		sectorShare.setEIDSectorShare(domElement);
 	}