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, 12 insertions, 12 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryUnmarshaller.java
index deb695ac6..c9ac243f1 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryUnmarshaller.java
@@ -20,7 +20,6 @@ import org.opensaml.xml.XMLObject;
 
 import eu.stork.peps.auth.engine.core.SPCountry;
 
-
 /**
  * The Class SPCountryUnmarshaller.
  * 
@@ -28,15 +27,16 @@ import eu.stork.peps.auth.engine.core.SPCountry;
  */
 public class SPCountryUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
-    /**
-     * Process element content.
-     *
-     * @param samlObject the SAML object
-     * @param elementContent the element content
-     */
-    protected final void processElementContent(final XMLObject samlObject,
-	    final String elementContent) {
-	final SPCountry spCountry = (SPCountry) samlObject;
-	spCountry.setSPCountry(elementContent);
-    }
+	/**
+	 * Process element content.
+	 *
+	 * @param samlObject
+	 *            the SAML object
+	 * @param elementContent
+	 *            the element content
+	 */
+	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
+		final SPCountry spCountry = (SPCountry) samlObject;
+		spCountry.setSPCountry(elementContent);
+	}
 }
\ No newline at end of file