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, 38 insertions, 36 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/InstanceEngine.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/InstanceEngine.java
index 4d9bba8e7..0343d915a 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/InstanceEngine.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/InstanceEngine.java
@@ -25,46 +25,48 @@ import java.util.List;
  */
 public class InstanceEngine {
 
-    /** The configuration. */
-    private List<ConfigurationEngine> configuration = new ArrayList<ConfigurationEngine>();
+	/** The configuration. */
+	private List<ConfigurationEngine> configuration = new ArrayList<ConfigurationEngine>();
 
-    /** The name. */
-    private String name;
+	/** The name. */
+	private String name;
 
-    /**
-     * Gets the parameters.
-     * 
-     * @return the parameters
-     */
-    public final List<ConfigurationEngine> getConfiguration() {
-	return this.configuration;
-    }
+	/**
+	 * Gets the parameters.
+	 * 
+	 * @return the parameters
+	 */
+	public final List<ConfigurationEngine> getConfiguration() {
+		return this.configuration;
+	}
 
-    /**
-     * Gets the name.
-     * 
-     * @return the name
-     */
-    public final String getName() {
-	return name;
-    }
+	/**
+	 * Gets the name.
+	 * 
+	 * @return the name
+	 */
+	public final String getName() {
+		return name;
+	}
 
-    /**
-     * Sets the parameters.
-     * 
-     * @param newConfiguration the new parameters
-     */
-    public final void setConfiguration(final List<ConfigurationEngine> newConfiguration) {
-	this.configuration = newConfiguration;
-    }
+	/**
+	 * Sets the parameters.
+	 * 
+	 * @param newConfiguration
+	 *            the new parameters
+	 */
+	public final void setConfiguration(final List<ConfigurationEngine> newConfiguration) {
+		this.configuration = newConfiguration;
+	}
 
-    /**
-     * Sets the name.
-     * 
-     * @param newName the new name
-     */
-    public final void setName(final String newName) {
-	this.name = newName;
-    }
+	/**
+	 * Sets the name.
+	 * 
+	 * @param newName
+	 *            the new name
+	 */
+	public final void setName(final String newName) {
+		this.name = newName;
+	}
 
 }