Merge branch 'master' of md-master.swamid.se:swamid-metadata

Conflicts: swamid-1.0/shib-idp-1.oru.se.xml
author: Leif Johansson <leifj@sunet.se> 2013-06-16 20:25:53 +0200
committer: Leif Johansson <leifj@sunet.se> 2013-06-16 20:25:53 +0200
commit: b217869b73c7ceb7653972740e0f796cf9bbd383 (patch)
tree: ca10c13dc56d3c1665f5e89759e91ede7489bffc /swamid-2.0
parent: 5b14805f2ecc3b89ea0ff9b08a8714a3b895347e (diff)
parent: c5391135cbba3c20214e9e44c433925931df1453 (diff)
63 files changed, 396 insertions, 396 deletions
diff --git a/swamid-2.0/akka-anv.uu.se.xml b/swamid-2.0/akka-anv.uu.se.xml
index 39cc5df0..ad77f731 100644
--- a/swamid-2.0/akka-anv.uu.se.xml
+++ b/swamid-2.0/akka-anv.uu.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://akka-anv.uu.se/shibboleth">
-
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -13,15 +13,12 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
-          NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-          Name="http://macedir.org/entity-category">
-          <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        </samla:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://akka-anv.uu.se/Shibboleth.sso/Login"/>
@@ -83,5 +80,4 @@ JnhHj8Wsg0csCS86vOCTNXVKXHcRIUL5FaLf+8MrSHrs8WR4CN4AHLuprwthtQyV
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML/POST" index="11"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML/Artifact" index="12"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/akkatest.its.uu.se.xml b/swamid-2.0/akkatest.its.uu.se.xml
index 0b5c3091..939a484c 100644
--- a/swamid-2.0/akkatest.its.uu.se.xml
+++ b/swamid-2.0/akkatest.its.uu.se.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://akkatest.its.uu.se/Shibboleth">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <md:KeyDescriptor>
@@ -30,4 +31,3 @@ blxtYGVB1uGczqhd4Vn/jIHHcW5mx6oamuRXMcuRoAIJxw8aL7s+0Gm6vNNbLIpt
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://akkatest.its.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
   </md:SPSSODescriptor>
 </md:EntityDescriptor>
-
diff --git a/swamid-2.0/aktivera.ki.se-shibboleth.xml b/swamid-2.0/aktivera.ki.se-shibboleth.xml
index e1632e8e..0f4ec206 100644
--- a/swamid-2.0/aktivera.ki.se-shibboleth.xml
+++ b/swamid-2.0/aktivera.ki.se-shibboleth.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aktivera.ki.se/shibboleth">
-
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -13,13 +12,11 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
-
     <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
       <mdui:DisplayName xml:lang="sv">Kontoaktivering Karolinska Institutet</mdui:DisplayName>
       <mdui:DisplayName xml:lang="en">Account activation Karolinska Institutet</mdui:DisplayName>
@@ -27,7 +24,6 @@
       <mdui:Description xml:lang="en">Account activation service for Karolinska Institutet</mdui:Description>
     </mdui:UIInfo>
   </md:Extensions>
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aktivera.ki.se/Shibboleth.sso/Login"/>
@@ -76,5 +72,4 @@ t1UEJRh1QFCjTJZ0dWFqE9ZDz8jPeZGuERdOnxv9ooMtwU9t1w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aktivera.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aktivera.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/artisan-idp.sunet.se.xml b/swamid-2.0/artisan-idp.sunet.se.xml
index b053618c..444be912 100644
--- a/swamid-2.0/artisan-idp.sunet.se.xml
+++ b/swamid-2.0/artisan-idp.sunet.se.xml
@@ -1,13 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://artisan-idp.sunet.se/simplesaml/module.php/saml/sp/metadata.php/default-sp">
   <md:Extensions>
-     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
-          NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-          Name="http://macedir.org/entity-category">
-          <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-       </samla:Attribute>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml b/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml
index 74b7fe1d..36b100d3 100644
--- a/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml
+++ b/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bedomningshandboken.uhr.se/shibboleth">
-
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -30,7 +29,6 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bedomningshandboken.uhr.se/Shibboleth.sso/Login"/>
@@ -81,5 +79,4 @@ ut8A71AN/z8omfWkOpv19vkKMMqNng1j0iw2cSCey2B1Ox2OWiPXuCJI
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bedomningshandboken.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bedomningshandboken.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/box-idp.sunet.se-idp.xml b/swamid-2.0/box-idp.sunet.se-idp.xml
index 830a60bd..87a129b7 100644
--- a/swamid-2.0/box-idp.sunet.se-idp.xml
+++ b/swamid-2.0/box-idp.sunet.se-idp.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://box-idp.sunet.se/simplesaml/saml2/idp/metadata.php">
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDjjCCAnagAwIBAgIJAKbtZfJN7G7eMA0GCSqGSIb3DQEBBQUAMDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZTAeFw0xMjA0MTkwNzAxMTBaFw0yMjA0MTkwNzAxMTBaMDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO+53L5J4zaSe/ot/CU+fX/xsE0q2Vsvgs6Jrz4bgPtkiXcCCRcp1kV9wRxBEohK75DtumowRN9P0qL5SsawM5o6XflMpL9vhO1Xvi8NnrFp/utUnjwevgbxsi5efetqIezE+B8cimv1MEfN4/XxiCuKbqluEC4HYuopf9Cn32ob2VnQA31WYwW42+pfS733M4EIMYkpBdaacpJKFmCsu9BHnGgFTiSgJsvX9OGG7iwSB31Jp817BFOB0yhvx7Y2yFLSnRyyg/20BJ0t9R8UFVB4rx5bjyTlTGwvPg048UV8Go3wDSax18OT0AoTfE7O3QoXNOhPr1qi4bs0KL92R7sCAwEAAaOBmjCBlzAdBgNVHQ4EFgQUluTZFj+ee4BZ0slOOiUpsZG/KjwwaAYDVR0jBGEwX4AUluTZFj+ee4BZ0slOOiUpsZG/KjyhPKQ6MDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZYIJAKbtZfJN7G7eMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADPhDcfQDwHGhTeQuSDaBfa1/gbJkuiNRZSN000CIM1BalnuK5unV05SvBMG4t7mSj9oO+NnpjEBfV393I2XV5ICRuHbUpoX8tezGOA3I8amItR6WzJtFSn/Dv230KRcEuCAWz/A7LKog16eOPPDj64vBI9Lk5gYpXRB3y1Pnv+5IUgXb2YnS6XAEduHpm2dkj2CuSmpsWTPJapm/opsJvmrkZbvwQN1POPDyWW8Rb/gSr7XpFsDQ7lXObd2ADv82WENB6DLuUq1ilAkVR8Zs4OkFnLYASFUC25GtfUdUap/anb5gHF7a8MKN+NYlfNQWE1dm1jccCnA3eIBxkArDdU=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDjjCCAnagAwIBAgIJAKbtZfJN7G7eMA0GCSqGSIb3DQEBBQUAMDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZTAeFw0xMjA0MTkwNzAxMTBaFw0yMjA0MTkwNzAxMTBaMDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO+53L5J4zaSe/ot/CU+fX/xsE0q2Vsvgs6Jrz4bgPtkiXcCCRcp1kV9wRxBEohK75DtumowRN9P0qL5SsawM5o6XflMpL9vhO1Xvi8NnrFp/utUnjwevgbxsi5efetqIezE+B8cimv1MEfN4/XxiCuKbqluEC4HYuopf9Cn32ob2VnQA31WYwW42+pfS733M4EIMYkpBdaacpJKFmCsu9BHnGgFTiSgJsvX9OGG7iwSB31Jp817BFOB0yhvx7Y2yFLSnRyyg/20BJ0t9R8UFVB4rx5bjyTlTGwvPg048UV8Go3wDSax18OT0AoTfE7O3QoXNOhPr1qi4bs0KL92R7sCAwEAAaOBmjCBlzAdBgNVHQ4EFgQUluTZFj+ee4BZ0slOOiUpsZG/KjwwaAYDVR0jBGEwX4AUluTZFj+ee4BZ0slOOiUpsZG/KjyhPKQ6MDgxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEZMBcGA1UEAxMQYm94LWlkcC5zdW5ldC5zZYIJAKbtZfJN7G7eMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADPhDcfQDwHGhTeQuSDaBfa1/gbJkuiNRZSN000CIM1BalnuK5unV05SvBMG4t7mSj9oO+NnpjEBfV393I2XV5ICRuHbUpoX8tezGOA3I8amItR6WzJtFSn/Dv230KRcEuCAWz/A7LKog16eOPPDj64vBI9Lk5gYpXRB3y1Pnv+5IUgXb2YnS6XAEduHpm2dkj2CuSmpsWTPJapm/opsJvmrkZbvwQN1POPDyWW8Rb/gSr7XpFsDQ7lXObd2ADv82WENB6DLuUq1ilAkVR8Zs4OkFnLYASFUC25GtfUdUap/anb5gHF7a8MKN+NYlfNQWE1dm1jccCnA3eIBxkArDdU=</ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-2.0/box-idp.sunet.se.xml b/swamid-2.0/box-idp.sunet.se.xml
index 3c47ca1d..835d719e 100644
--- a/swamid-2.0/box-idp.sunet.se.xml
+++ b/swamid-2.0/box-idp.sunet.se.xml
@@ -1,13 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://box-idp.sunet.se/simplesaml/module.php/saml/sp/metadata.php/default-sp">
   <md:Extensions>
-     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
-          NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-          Name="http://macedir.org/entity-category">
-          <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-       </samla:Attribute>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-2.0/box.net.xml b/swamid-2.0/box.net.xml
index c3dcbfe9..b079411c 100644
--- a/swamid-2.0/box.net.xml
+++ b/swamid-2.0/box.net.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="box.net">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
diff --git a/swamid-2.0/ci.nordu.net.xml b/swamid-2.0/ci.nordu.net.xml
index cb159018..938a34ff 100644
--- a/swamid-2.0/ci.nordu.net.xml
+++ b/swamid-2.0/ci.nordu.net.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ci.nordu.net/shibboleth">
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ci.nordu.net/Shibboleth.sso/Login"/>
@@ -42,5 +42,4 @@ Ngx5k0w6C4avz1ua/NNuUD5WoB1mXA+YiQiIEUTnPQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ci.nordu.net/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ci.nordu.net/Shibboleth.sso/SAML/Artifact" index="5"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/coip.app.nordu.net.xml b/swamid-2.0/coip.app.nordu.net.xml
index fb3c1a29..88331db5 100644
--- a/swamid-2.0/coip.app.nordu.net.xml
+++ b/swamid-2.0/coip.app.nordu.net.xml
@@ -1,5 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<md:EntityDescriptor entityID="https://coip.app.nordu.net/saml2/sp/metadata" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><md:KeyDescriptor><ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:X509Data><ds:X509Certificate>MIIEujCCA6KgAwIBAgIQLINqZJFs8l1wYd2J2IBMTjANBgkqhkiG9w0BAQUFADA2
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://coip.app.nordu.net/saml2/sp/metadata">
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEujCCA6KgAwIBAgIQLINqZJFs8l1wYd2J2IBMTjANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTEyMDIyOTAwMDAwMFoXDTE1MDIyODIzNTk1OVowgZUxCzAJBgNV
 BAYTAkRLMQowCAYDVQQREwEuMQowCAYDVQQIEwEuMQswCQYDVQQHEwIuLjEZMBcG
@@ -25,4 +30,33 @@ f06K4cm7ngUg80ZEYK00ioAyFle56qPfZ5UM25QFzV38DGvusLl5H1bTtpz1ijh7
 kO/ehJVo4K64KVCbjOr1bavp665TtcIQX2qoPsnTZY30gQ/X/K2UJQSUE5Qc+o19
 BkvvVT5jNYdeLZHXbC6X4kXYNhFKZaz9nURgfaFQIeIEu/zmsIM8tcwLjZyF1veH
 wXXiBDXS3PNHXQnnpys=
-</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coip.app.nordu.net/saml2/sp/ls/" /><md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coip.app.nordu.net/saml2/sp/acs/" index="1" /><md:AttributeConsumingService index="1"><md:ServiceName xml:lang="en">COIP</md:ServiceName><md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" /><md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" /></md:AttributeConsumingService></md:SPSSODescriptor><md:Organization><md:OrganizationName xml:lang="en">NORDUNet</md:OrganizationName><md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName><md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL></md:Organization><md:ContactPerson contactType="technical"><md:Company>NORDUnet</md:Company><md:GivenName>Leif</md:GivenName><md:SurName>Johansson</md:SurName><md:EmailAddress>leifj@nordu.net</md:EmailAddress></md:ContactPerson><md:ContactPerson contactType="technical"><md:Company>NORDUnet</md:Company><md:GivenName>Johan</md:GivenName><md:SurName>Berggren</md:SurName><md:EmailAddress>jbn@nordu.net</md:EmailAddress></md:ContactPerson></md:EntityDescriptor>
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coip.app.nordu.net/saml2/sp/ls/"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coip.app.nordu.net/saml2/sp/acs/" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">COIP</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUNet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet</md:Company>
+    <md:GivenName>Leif</md:GivenName>
+    <md:SurName>Johansson</md:SurName>
+    <md:EmailAddress>leifj@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet</md:Company>
+    <md:GivenName>Johan</md:GivenName>
+    <md:SurName>Berggren</md:SurName>
+    <md:EmailAddress>jbn@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/connect.funet.fi.xml b/swamid-2.0/connect.funet.fi.xml
index 352f3f59..19ec84f8 100644
--- a/swamid-2.0/connect.funet.fi.xml
+++ b/swamid-2.0/connect.funet.fi.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.funet.fi/shibboleth">
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.funet.fi/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
@@ -71,15 +71,14 @@ EMBSvHkNXEFDf/FDbw4kjn5ie1pmF4qu+jHVHyB4y4Roz0QFoYIeOWaRMw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect.funet.fi/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect.funet.fi/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="0">
-       <md:ServiceName xml:lang="en">FUNET E-Meeting Service</md:ServiceName>
-       <md:ServiceDescription xml:lang="en">FUNET E-Meeting Service (Adobe Connect)</md:ServiceDescription>
-       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
-       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
-       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
-       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+      <md:ServiceName xml:lang="en">FUNET E-Meeting Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">FUNET E-Meeting Service (Adobe Connect)</md:ServiceDescription>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/crowd-test.it.su.se-Shibboleth.sso.xml b/swamid-2.0/crowd-test.it.su.se-Shibboleth.sso.xml
index 680561bf..db81f977 100644
--- a/swamid-2.0/crowd-test.it.su.se-Shibboleth.sso.xml
+++ b/swamid-2.0/crowd-test.it.su.se-Shibboleth.sso.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://crowd-test.it.su.se/Shibboleth.sso">
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd-test.it.su.se/Shibboleth.sso/WAYF" index="1"/>
@@ -14,7 +13,7 @@
       <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
         <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
           <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+          <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         </samla:Attribute>
       </mdattr:EntityAttributes>
     </md:Extensions>
@@ -84,5 +83,4 @@ KhnlJurRHjddtxHmLCSOZInPrJEiXjn6ew==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/e5.onthehub.com.xml b/swamid-2.0/e5.onthehub.com.xml
index d0e174b3..d9f56898 100644
--- a/swamid-2.0/e5.onthehub.com.xml
+++ b/swamid-2.0/e5.onthehub.com.xml
@@ -1,12 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://e5.onthehub.com">
   <md:Extensions>
-     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
-          NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-          Name="http://macedir.org/entity-category">
-          <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-       </samla:Attribute>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
diff --git a/swamid-2.0/fs.liu.se.xml b/swamid-2.0/fs.liu.se.xml
index e5e34493..0b75b816 100644
--- a/swamid-2.0/fs.liu.se.xml
+++ b/swamid-2.0/fs.liu.se.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://fs.liu.se/adfs/services/trust">
   <RoleDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="fs.liu.se">
     <KeyDescriptor use="encryption">
@@ -316,8 +316,8 @@
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
   </IDPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="sv-SE">Link&#xF6;ping University</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv-SE">Link&#xF6;ping University (ADFS)</OrganizationDisplayName>
+    <OrganizationName xml:lang="sv-SE">Linköping University</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv-SE">Linköping University (ADFS)</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv-SE">http://www.liu.se/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
diff --git a/swamid-2.0/gidp.geant.net-sp.xml b/swamid-2.0/gidp.geant.net-sp.xml
index cedb87d3..72e6b642 100644
--- a/swamid-2.0/gidp.geant.net-sp.xml
+++ b/swamid-2.0/gidp.geant.net-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gidp.geant.net/sp/module.php/saml/sp/metadata.php/default-sp">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
diff --git a/swamid-2.0/hades.slu.se.xml b/swamid-2.0/hades.slu.se.xml
index 0eee46b9..f669b10f 100644
--- a/swamid-2.0/hades.slu.se.xml
+++ b/swamid-2.0/hades.slu.se.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hades.slu.se/shibboleth">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
diff --git a/swamid-2.0/idp-test.nordu.net-sp.xml b/swamid-2.0/idp-test.nordu.net-sp.xml
index d7c2de66..327f7250 100644
--- a/swamid-2.0/idp-test.nordu.net-sp.xml
+++ b/swamid-2.0/idp-test.nordu.net-sp.xml
@@ -1,13 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.nordu.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
   <md:Extensions>
-     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
-          NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-          Name="http://macedir.org/entity-category">
-          <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-       </samla:Attribute>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-2.0/idp-test.nordu.net-ssp-idp.xml b/swamid-2.0/idp-test.nordu.net-ssp-idp.xml
index f086b725..12ae465e 100644
--- a/swamid-2.0/idp-test.nordu.net-ssp-idp.xml
+++ b/swamid-2.0/idp-test.nordu.net-ssp-idp.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp-test.nordu.net/simplesaml/saml2/idp/metadata.php">
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIID0DCCArigAwIBAgIJAIr7Fddfzg4nMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlNFMRIwEAYDVQQHEwlTdG9ja2hvbG0xDjAMBgNVBAoTBU5VTk9DMRswGQYDVQQDExJpZHAtdGVzdC5ub3JkdS5uZXQwHhcNMTIxMDI5MTgwNzQ1WhcNMjIxMDI3MTgwNzQ1WjBOMQswCQYDVQQGEwJTRTESMBAGA1UEBxMJU3RvY2tob2xtMQ4wDAYDVQQKEwVOVU5PQzEbMBkGA1UEAxMSaWRwLXRlc3Qubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3v3zhxKne0EmViKyxbsbe3qMjWQhWV2yVjrB5iGd9uoab16c25in8WxvRe0VvVCSsLgc0JU6JZHD30xEjNxrOu9kTeSyoG4uRX4T7fzJdWyadipV3QxsK9LCR+6ksw9mGu28mTDXtz7Wn/6H2vcEzgB0OOhqtfW4c+76oY83IrPARSrSZIeZbOJ2UJQYtqvK8H3hF3fNSoXRWk7+6FWkxS7lisQ3cT4cLeDnz2KkerTZzjz7pHBp0xCZ64fl74Q2BIVxPAczM2kU6n1sCC+Sd43jaPTdBbhEUAj9gwcdIM5O5UwO03C5qduu2ecJTa67Zd6PZkCqHiAeuoFBih1GwIDAQABo4GwMIGtMB0GA1UdDgQWBBTXJhD54J5C166ByFjM2AdH4A737zB+BgNVHSMEdzB1gBTXJhD54J5C166ByFjM2AdH4A7376FSpFAwTjELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEOMAwGA1UEChMFTlVOT0MxGzAZBgNVBAMTEmlkcC10ZXN0Lm5vcmR1Lm5ldIIJAIr7Fddfzg4nMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEj9YOaW9U4QT2h1Byw/IzH0NoWFCOY1ixSkCILg5Obll8tu4pqYgUb93bZnlClBx6S1Cc9v3cwVJWM9XayWGorpaVV8fXE8sWS0pEjcj5wW5bmQjHCbtn19sz6C7Ef7U4ZZrQ3iJvhaGlrBxO6oJ+Rxh0MB1ZdpohUm7blEockJ7O1vK54SDbaOQ/vsEMM+h0qqKitvaOjpUnGfKsn4k8H2yI95CoQjZe8QffqrHmpuUSpjSMq3AR5EJO3YPN0R19nSeksRjo5cLmWRpXQUA8wFcsW/4pFHhEhaq7ItX0WAKn7oAWghOq6sk+o3unRnIX8qJE/MOgThp4+8qwlM6a0=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIID0DCCArigAwIBAgIJAIr7Fddfzg4nMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlNFMRIwEAYDVQQHEwlTdG9ja2hvbG0xDjAMBgNVBAoTBU5VTk9DMRswGQYDVQQDExJpZHAtdGVzdC5ub3JkdS5uZXQwHhcNMTIxMDI5MTgwNzQ1WhcNMjIxMDI3MTgwNzQ1WjBOMQswCQYDVQQGEwJTRTESMBAGA1UEBxMJU3RvY2tob2xtMQ4wDAYDVQQKEwVOVU5PQzEbMBkGA1UEAxMSaWRwLXRlc3Qubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3v3zhxKne0EmViKyxbsbe3qMjWQhWV2yVjrB5iGd9uoab16c25in8WxvRe0VvVCSsLgc0JU6JZHD30xEjNxrOu9kTeSyoG4uRX4T7fzJdWyadipV3QxsK9LCR+6ksw9mGu28mTDXtz7Wn/6H2vcEzgB0OOhqtfW4c+76oY83IrPARSrSZIeZbOJ2UJQYtqvK8H3hF3fNSoXRWk7+6FWkxS7lisQ3cT4cLeDnz2KkerTZzjz7pHBp0xCZ64fl74Q2BIVxPAczM2kU6n1sCC+Sd43jaPTdBbhEUAj9gwcdIM5O5UwO03C5qduu2ecJTa67Zd6PZkCqHiAeuoFBih1GwIDAQABo4GwMIGtMB0GA1UdDgQWBBTXJhD54J5C166ByFjM2AdH4A737zB+BgNVHSMEdzB1gBTXJhD54J5C166ByFjM2AdH4A7376FSpFAwTjELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTEOMAwGA1UEChMFTlVOT0MxGzAZBgNVBAMTEmlkcC10ZXN0Lm5vcmR1Lm5ldIIJAIr7Fddfzg4nMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEj9YOaW9U4QT2h1Byw/IzH0NoWFCOY1ixSkCILg5Obll8tu4pqYgUb93bZnlClBx6S1Cc9v3cwVJWM9XayWGorpaVV8fXE8sWS0pEjcj5wW5bmQjHCbtn19sz6C7Ef7U4ZZrQ3iJvhaGlrBxO6oJ+Rxh0MB1ZdpohUm7blEockJ7O1vK54SDbaOQ/vsEMM+h0qqKitvaOjpUnGfKsn4k8H2yI95CoQjZe8QffqrHmpuUSpjSMq3AR5EJO3YPN0R19nSeksRjo5cLmWRpXQUA8wFcsW/4pFHhEhaq7ItX0WAKn7oAWghOq6sk+o3unRnIX8qJE/MOgThp4+8qwlM6a0=</ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-2.0/idp.kb.se.xml b/swamid-2.0/idp.kb.se.xml
index 9775cdbd..74d40456 100644
--- a/swamid-2.0/idp.kb.se.xml
+++ b/swamid-2.0/idp.kb.se.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.kb.se/idp/shibboleth">
-
-    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">kb.se</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">kb.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEDCCAfigAwIBAgIVANtF15ZO6H7sUe14fLarTWN68i+6MA0GCSqGSIb3DQEB
 BQUAMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTAeFw0xMjA1MTUwODE2MTZaFw0xMzA1
 MTUwODE2MTZaMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
@@ -30,35 +27,26 @@ eXhXEiHIleIlDkOMy3mgyjg2l2azS/K4Um12iEbCxONc8UvQipy2nzJ6XT8qp483
 HoPbenzIMS3KvKqUl64+5qwAZhM=
 
                     </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-	<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-         
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kb.se/idp/profile/Shibboleth/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kb.se/idp/profile/SAML2/POST/SSO"/>
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kb.se/idp/profile/SAML2/Redirect/SSO"/>
-    </IDPSSODescriptor>
-
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">kb.se</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kb.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kb.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kb.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">kb.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDEDCCAfigAwIBAgIVANtF15ZO6H7sUe14fLarTWN68i+6MA0GCSqGSIb3DQEB
 BQUAMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTAeFw0xMjA1MTUwODE2MTZaFw0xMzA1
 MTUwODE2MTZaMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
@@ -78,25 +66,22 @@ eXhXEiHIleIlDkOMy3mgyjg2l2azS/K4Um12iEbCxONc8UvQipy2nzJ6XT8qp483
 HoPbenzIMS3KvKqUl64+5qwAZhM=
 
                     </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-         
-    </AttributeAuthorityDescriptor>
-    <Organization>
-    	<OrganizationName xml:lang="en">KB</OrganizationName>
-    	<OrganizationDisplayName xml:lang="sv">Kungliga Biblioteket</OrganizationDisplayName>
-        <OrganizationDisplayName xml:lang="en">National Library of Sweden</OrganizationDisplayName>
-    	<OrganizationURL xml:lang="en">http://kb.se</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-    	<Company>Kungliga Biblioteket</Company>
-    	<EmailAddress>swamid@kb.se</EmailAddress>
-    </ContactPerson>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">KB</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Kungliga Biblioteket</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">National Library of Sweden</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://kb.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Kungliga Biblioteket</Company>
+    <EmailAddress>swamid@kb.se</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/idp2-1.slu.se.xml b/swamid-2.0/idp2-1.slu.se.xml
index d5de15c2..359287e1 100644
--- a/swamid-2.0/idp2-1.slu.se.xml
+++ b/swamid-2.0/idp2-1.slu.se.xml
@@ -3,7 +3,6 @@
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
-
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Swedish University of Agricultural Science</mdui:DisplayName>
diff --git a/swamid-2.0/idp2-test.slu.se.xml b/swamid-2.0/idp2-test.slu.se.xml
index b79da4ff..d1307027 100644
--- a/swamid-2.0/idp2-test.slu.se.xml
+++ b/swamid-2.0/idp2-test.slu.se.xml
@@ -1,4 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?><EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2-test.slu.se/idp/shibboleth" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"><Extensions><shibmd:Scope regexp="false">slu.se</shibmd:Scope></Extensions><KeyDescriptor><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPejhcnnbj2RgPhljHfQBYe2qEWZMA0GCSqGSIb3DQEB
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp2-test.slu.se/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPejhcnnbj2RgPhljHfQBYe2qEWZMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGlkcDItdGVzdC5zbHUuc2UwHhcNMTMwMzExMTUwMDEz
 WhcNMzMwMzExMTUwMDEzWjAbMRkwFwYDVQQDExBpZHAyLXRlc3Quc2x1LnNlMIIB
 IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvsPOY6i0Lkm1oGdP6bBXNiaU
@@ -14,7 +23,27 @@ nbnuw/DjSfwcU7EEXCv974vUJzkIcSVk7hHu+6e7401p02b6DXUExV7CTGn5QRCs
 oiATJXOgCIQd6ZoK8KxHKn/QhgL0qfKMS51Ct5W+MMaSAl6s6mSjNibcDEsSA2JS
 0+dQWI60koi7B2U5ToLnMXHKvu1mKeFCENh6/B0h6xQkSNYI6bLIsbBe8x9ukW9K
 YDkKy11d6W9v8pPknySJoAC5hL1v26ov7NpY6LN+tNAhuSfMSKo1ugFmOfX/CAIc
-6LuOz5eqy6nOAbVhtUn5GG0AdPsPNjafmMB3dc9MqIpMItErBERy4IcNl4YexZa6</ds:X509Certificate></ds:X509Data></ds:KeyInfo></KeyDescriptor><ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-test.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/><ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-test.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/><NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat><NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat><SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2-test.slu.se/idp/profile/Shibboleth/SSO"/><SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2-test.slu.se/idp/profile/SAML2/POST/SSO"/><SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2-test.slu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/><SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2-test.slu.se/idp/profile/SAML2/Redirect/SSO"/></IDPSSODescriptor><AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"><Extensions><shibmd:Scope regexp="false">slu.se</shibmd:Scope></Extensions><KeyDescriptor><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPejhcnnbj2RgPhljHfQBYe2qEWZMA0GCSqGSIb3DQEB
+6LuOz5eqy6nOAbVhtUn5GG0AdPsPNjafmMB3dc9MqIpMItErBERy4IcNl4YexZa6</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-test.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-test.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2-test.slu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2-test.slu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2-test.slu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2-test.slu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPejhcnnbj2RgPhljHfQBYe2qEWZMA0GCSqGSIb3DQEB
 BQUAMBsxGTAXBgNVBAMTEGlkcDItdGVzdC5zbHUuc2UwHhcNMTMwMzExMTUwMDEz
 WhcNMzMwMzExMTUwMDEzWjAbMRkwFwYDVQQDExBpZHAyLXRlc3Quc2x1LnNlMIIB
 IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvsPOY6i0Lkm1oGdP6bBXNiaU
@@ -30,4 +59,30 @@ nbnuw/DjSfwcU7EEXCv974vUJzkIcSVk7hHu+6e7401p02b6DXUExV7CTGn5QRCs
 oiATJXOgCIQd6ZoK8KxHKn/QhgL0qfKMS51Ct5W+MMaSAl6s6mSjNibcDEsSA2JS
 0+dQWI60koi7B2U5ToLnMXHKvu1mKeFCENh6/B0h6xQkSNYI6bLIsbBe8x9ukW9K
 YDkKy11d6W9v8pPknySJoAC5hL1v26ov7NpY6LN+tNAhuSfMSKo1ugFmOfX/CAIc
-6LuOz5eqy6nOAbVhtUn5GG0AdPsPNjafmMB3dc9MqIpMItErBERy4IcNl4YexZa6</ds:X509Certificate></ds:X509Data></ds:KeyInfo></KeyDescriptor><AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-test.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/><AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-test.slu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/><NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat><NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat></AttributeAuthorityDescriptor><Organization><OrganizationName xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="en">Swedish University of Agricultural Science</OrganizationName><OrganizationDisplayName xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="en">Swedish University of Agricultural Science</OrganizationDisplayName><OrganizationURL xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="en">http://www.slu.se/en/</OrganizationURL></Organization><ContactPerson contactType="technical" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><GivenName>Pia Skotare</GivenName><EmailAddress>mailto:pia.skotare@gmail.com</EmailAddress></ContactPerson><ContactPerson contactType="administrative" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><GivenName>Bo Sarling</GivenName><EmailAddress>mailto:bo.sarling@slu.se</EmailAddress></ContactPerson><ContactPerson contactType="support" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><GivenName>Help Desk</GivenName><EmailAddress>mailto:IT-stod@slu.se</EmailAddress></ContactPerson></EntityDescriptor>
-\ No newline at end of file
+6LuOz5eqy6nOAbVhtUn5GG0AdPsPNjafmMB3dc9MqIpMItErBERy4IcNl4YexZa6</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-test.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-test.slu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Swedish University of Agricultural Science</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.slu.se/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <GivenName>Pia Skotare</GivenName>
+    <EmailAddress>mailto:pia.skotare@gmail.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <GivenName>Bo Sarling</GivenName>
+    <EmailAddress>mailto:bo.sarling@slu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <GivenName>Help Desk</GivenName>
+    <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml b/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml
index b9422621..24c53f8f 100644
--- a/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml
+++ b/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp2.test.umu.se/saml2/idp/metadata.php">
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umu.se</shibmd:Scope>
+      <shibmd:Scope regexp="false">umu.se</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDkzCCAnugAwIBAgIJAMh43FpeVgSGMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxGTAXBgNVBAMMEGlkcDIudGVzdC51bXUuc2UwHhcNMTExMjIyMDk0NDI3WhcNMjExMjE5MDk0NDI3WjBgMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRkwFwYDVQQDDBBpZHAyLnRlc3QudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPXzjMLC6YLO7E83Ga1ZDZFf7i3iJaZfaYUgEbujSrhD0/cbF6aaK40kCln1D1Ohfd5w2i+IGhG+WxTYfvhTGrhi9JG7D0nicid+SL4grrqAchkklkRCoexHy/aPbt00bOt2xablxrxCscejpwIkZnK7NTlgX/0qImHia4esdswMT24F/IKDCQHyej8UNcBz5ghZ7pT4YoXmGlWIehaEkBDGvVdQtIDXBw2V+JWUxT3eEwj/KT9Fxt0ENGW7OGeic4zdFd3y21T3n50r5vxur1rQMjkihPrLtJ9m4G1S7O8huqcXvvEEa2YNL84AgWLP9NSFQtzSxQXAvXbYdhv5OwIDAQABo1AwTjAdBgNVHQ4EFgQU2U+AOc/bptlTZ8dwrJFUyp/fNq8wHwYDVR0jBBgwFoAU2U+AOc/bptlTZ8dwrJFUyp/fNq8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPweZGfiyNRw2YYxOiuuaqvnnp6l0L0h76ddvbdXetDd470L+UnrRcZ20k7afr0T29K8LP2qJnlc0kbLYJcDfl61W9Y5bPgryekGRXCAo0ldB8kZWYWDt6cwkf+N9th3mHli0holE+6OFgKHKDrymyCWUUAgKagAee62O1salCwl06Jl8oO1o09eTVYRKk43I8l+v1NiA10nQZFQaetmy4UFDaN+mnoeVbly5Ccc/UNOGmwLSO8G/wg3DcOdxWMXwoASyRi7nmj6ZMmINC/A2UcFVHzo9QC/n3H23bhyJCaRe0Pgkk1Q2fygtftoEdMXgUAKkyJd+H3eptzAkGHPXJg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDkzCCAnugAwIBAgIJAMh43FpeVgSGMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxGTAXBgNVBAMMEGlkcDIudGVzdC51bXUuc2UwHhcNMTExMjIyMDk0NDI3WhcNMjExMjE5MDk0NDI3WjBgMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRkwFwYDVQQDDBBpZHAyLnRlc3QudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPXzjMLC6YLO7E83Ga1ZDZFf7i3iJaZfaYUgEbujSrhD0/cbF6aaK40kCln1D1Ohfd5w2i+IGhG+WxTYfvhTGrhi9JG7D0nicid+SL4grrqAchkklkRCoexHy/aPbt00bOt2xablxrxCscejpwIkZnK7NTlgX/0qImHia4esdswMT24F/IKDCQHyej8UNcBz5ghZ7pT4YoXmGlWIehaEkBDGvVdQtIDXBw2V+JWUxT3eEwj/KT9Fxt0ENGW7OGeic4zdFd3y21T3n50r5vxur1rQMjkihPrLtJ9m4G1S7O8huqcXvvEEa2YNL84AgWLP9NSFQtzSxQXAvXbYdhv5OwIDAQABo1AwTjAdBgNVHQ4EFgQU2U+AOc/bptlTZ8dwrJFUyp/fNq8wHwYDVR0jBBgwFoAU2U+AOc/bptlTZ8dwrJFUyp/fNq8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPweZGfiyNRw2YYxOiuuaqvnnp6l0L0h76ddvbdXetDd470L+UnrRcZ20k7afr0T29K8LP2qJnlc0kbLYJcDfl61W9Y5bPgryekGRXCAo0ldB8kZWYWDt6cwkf+N9th3mHli0holE+6OFgKHKDrymyCWUUAgKagAee62O1salCwl06Jl8oO1o09eTVYRKk43I8l+v1NiA10nQZFQaetmy4UFDaN+mnoeVbly5Ccc/UNOGmwLSO8G/wg3DcOdxWMXwoASyRi7nmj6ZMmINC/A2UcFVHzo9QC/n3H23bhyJCaRe0Pgkk1Q2fygtftoEdMXgUAKkyJd+H3eptzAkGHPXJg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEeDCCA2CgAwIBAgIQSNslvGdmCXnbM5xzWOyrwTANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDkwMTAwMDAwMFoXDTEzMDgzMTIzNTk1OVowUzELMAkGA1UEBhMCU0UxGTAXBgNVBAoTEFVtZWEgdW5pdmVyc2l0ZXQxDjAMBgNVBAsTBVVNREFDMRkwFwYDVQQDExBpZHAyLnRlc3QudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqnsLBvs8DxJffl1zqULjBc1a+c1+mH+eW2BgUxNOG9FJCZqWAJFO8T4m3c1kO9VSQRSFqCMhQd08bfzySevDwgjX3+mR0UfJbtvcCLujDbSnE/1KgMv9EWcqzqyHsw8sL4ShG21pKaCjlP7Abq9T1flRixM+y47LEqnMlHOPKzNG4+366YzKIudsqNeiqwwAmEE4FZEwooBj8paWl800tNL4fUc7Y4sBxfs3j9e0h3sr32LRhQCL8wAa3OrRmoBrbEp/QDygQZ/XE+cjgbDSPzV/Ii4av4CF8OU+lYysrIZMDkTWjbXwkofm7HwbWgb+ukGO4RQdlf1gTG3pn15fQIDAQABo4IBYzCCAV8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBRq/M6MhWNHffNKe9OpmRL57m17MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBsGA1UdEQQUMBKCEGlkcDIudGVzdC51bXUuc2UwDQYJKoZIhvcNAQEFBQADggEBALNp2cyl51WNMXfW6YKwmZ6uOu07sGb5ONvteQ8L3qw8bN5ftBiGGi4LeckZj1K2/ql6roW2AeBdH2ZbsSPzfbgZUGVvZMqm0t/Ty24bhAcBtGmJd8oxDH5z8EwMA3Ko5y/n3Mxgn4kjwmDAuF44aVQG8s7Hh9eVvkQyD81ABpUACj+iqs1ynACdQAk2/As4zsCE0iaew/NQ52R7awPB5KitXABpiaj5pDTEsMVRuSKnTErLNTNE9gE0eeuN8bGsU3Hj7ndohqt8bSQLapIHU8odY52Ekjaq8L4etnipjTxrvZqu5TSskrkb9uOViUWND9DB1fKmTUaAeKWlOS/B0X0=</ds:X509Certificate>
         </ds:X509Data>
@@ -33,8 +33,8 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
     <md:OrganizationName xml:lang="se">UmU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ume&#xE5; University (New)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="se">Ume&#xE5; universitet (Ny)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Umeå University (New)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="se">Umeå universitet (Ny)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
     <md:OrganizationURL xml:lang="se">http://www.umu.se</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
index 4e19aeee..5041d272 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-00.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -47,5 +48,4 @@ w5aKug==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
index c137fe17..868ec842 100644
--- a/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-01.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-01.ladok.umu.se-gui-sp.xml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -47,5 +48,4 @@ p012eg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml
index 3e12acba..f784e817 100644
--- a/swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-02.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-02.ladok.umu.se-gui-sp.xml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -47,5 +48,4 @@ BeVqTg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-02.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml
index fa49441a..d9220aef 100644
--- a/swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-03.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-03.ladok.umu.se-gui-sp.xml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -47,5 +48,4 @@ OqxKbw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-03.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml
index a77e5750..fb1dfeab 100644
--- a/swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-04.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-04.ladok.umu.se-gui-sp.xml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -47,5 +48,4 @@ AMLCoA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-04.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml
index 69d672cb..3136654d 100644
--- a/swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-05.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-05.ladok.umu.se-gui-sp.xml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -47,5 +48,4 @@ Ij/QYw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-05.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml
index aa950fb0..e3a15881 100644
--- a/swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-06.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-06.ladok.umu.se-gui-sp.xml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -47,5 +48,4 @@ z181Cw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-06.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml
index a4f85a52..8831ec02 100644
--- a/swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-07.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-07.ladok.umu.se-gui-sp.xml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -47,5 +48,4 @@ LB5BtA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-07.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml
index 286687a5..664b3fbc 100644
--- a/swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-08.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-08.ladok.umu.se-gui-sp.xml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -47,5 +48,4 @@ MTpiVw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-08.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml
index cd329168..72d62392 100644
--- a/swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-09.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-09.ladok.umu.se-gui-sp.xml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -47,5 +48,4 @@ QwOzJA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-09.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml
index 3351bdba..07a39ec4 100644
--- a/swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-10.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-10.ladok.umu.se-gui-sp.xml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -47,5 +48,4 @@ zL2y+w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
index d81023f8..dbf5a750 100644
--- a/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-00.its.umu.se/gui-sp">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -47,5 +48,4 @@ EeE68EA0OgCl1QP8GuR3llSLtvNsQS1JI2+LMPuma6sSEr1nQqwuZgZkQm78bygF
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-00.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml
index b60dcaab..7e194f5f 100644
--- a/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-01.its.umu.se/gui-sp">
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ UiWyXm1zkG9otie1FBOVIQeZ5GKf3qEgfphkTBcigBCHKMxrDFOEjr9WlZEX7UAw
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml
index 5adb5978..62026710 100644
--- a/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-02.its.umu.se/gui-sp">
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ a/lggwDHd7eCy/34Rs5nJw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml
index 8a8ff2bc..a8b94fc2 100644
--- a/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-03.its.umu.se/gui-sp">
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ b/vkajQh9nHWAfPhgIOgkQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-03.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml
index 89548799..b622f761 100644
--- a/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-04.its.umu.se/gui-sp">
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ P6m+IbDWFLo61vhr/Nkcmw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-04.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml
index 0341a14f..ef892874 100644
--- a/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-05.its.umu.se/gui-sp">
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/Login"/>
@@ -49,5 +48,4 @@ ujZI0vVtQx+sTGMktkMb/w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-05.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml
index 4e750226..bc80b73b 100644
--- a/swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p00.ladok.umu.se/gui-sp" xml:base="swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -47,5 +48,4 @@ vt1mkOs1sbw=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml
index 97a98a9f..0f63ad7c 100644
--- a/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3test.its.umu.se/gui-sp" xml:base="swamid-1.0/ladok3test.its.umu.se-gui-sp.xml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -46,5 +47,4 @@ UEv/iCMoAJgGFRraTZFMDldSSu+MjBUuCi4kZaUImeVa0yXr7qBwZmYvdqgddDKO
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/maps.slu.se.xml b/swamid-2.0/maps.slu.se.xml
index 1fbfe85f..65bbf74e 100644
--- a/swamid-2.0/maps.slu.se.xml
+++ b/swamid-2.0/maps.slu.se.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://maps.slu.se/shibboleth">
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://maps.slu.se/Shibboleth.sso/Login"/>
@@ -42,5 +42,4 @@ QM0LY0RQjVj4+R+UdaRYQfizHG1rnKcEiRzi/mXYt2YXSjKuyvNUn6uc1GY9/3aJ
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://maps.slu.se/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://maps.slu.se/Shibboleth.sso/SAML/Artifact" index="5"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/mynetworkglobal.com.xml b/swamid-2.0/mynetworkglobal.com.xml
index 8fcb64e1..90541741 100644
--- a/swamid-2.0/mynetworkglobal.com.xml
+++ b/swamid-2.0/mynetworkglobal.com.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mynetworkglobal.com/simplesaml/module.php/saml/sp/metadata.php/mynetwork-sp">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
diff --git a/swamid-2.0/portalservices.miun.se-shibboleth.xml b/swamid-2.0/portalservices.miun.se-shibboleth.xml
index d7993d8b..f3c6091f 100644
--- a/swamid-2.0/portalservices.miun.se-shibboleth.xml
+++ b/swamid-2.0/portalservices.miun.se-shibboleth.xml
@@ -1,6 +1,5 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portalservices.miun.se/shibboleth">
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -68,5 +67,4 @@ TeyoCQ24KR1X/NqeCJndNrh9MFFO1D14hF64NWpRKRybaB2lzrgIiIWvlw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portalservices.miun.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portalservices.miun.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/problem.math.su.se-shilsbboleth.xml b/swamid-2.0/problem.math.su.se-shilsbboleth.xml
index a3886996..eedade4b 100644
--- a/swamid-2.0/problem.math.su.se-shilsbboleth.xml
+++ b/swamid-2.0/problem.math.su.se-shilsbboleth.xml
@@ -1,23 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://problem.math.su.se/shibboleth">
   <md:Extensions>
-     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
-          NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-          Name="http://macedir.org/entity-category">
-          <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-       </samla:Attribute>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-         <mdui:DisplayName xml:lang="sv">Externa kurssidor</mdui:DisplayName>
-         <mdui:DisplayName xml:lang="en">External course pages</mdui:DisplayName>
-         <mdui:Description xml:lang="sv">Kurssidor som riktar sig mot studenter utanför Matematiska institutionen.</mdui:Description>
-         <mdui:Description xml:lang="en">Course pages dedicated to students residing outside of the Mathematical institution.</mdui:Description>
-       </mdui:UIInfo>
-       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://problem.math.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Externa kurssidor</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">External course pages</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Kurssidor som riktar sig mot studenter utanför Matematiska institutionen.</mdui:Description>
+        <mdui:Description xml:lang="en">Course pages dedicated to students residing outside of the Mathematical institution.</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://problem.math.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://problem.math.su.se/Shibboleth.sso/WAYF/idp.hig.se"/>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -63,5 +62,4 @@ BYg6EHJWH+STzIe9LWWBS1ielXYFLLbSz38sMKEvtlZw5rnUbhXvhw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://problem.math.su.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://problem.math.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/rems.csc.fi.xml b/swamid-2.0/rems.csc.fi.xml
index e021f9f8..23558a64 100644
--- a/swamid-2.0/rems.csc.fi.xml
+++ b/swamid-2.0/rems.csc.fi.xml
@@ -1,39 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rems.csc.fi">
-    <Extensions>
-     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
-          NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-          Name="http://macedir.org/entity-category">
-          <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-       </samla:Attribute>
+  <Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-        <Extensions>
-            <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                Location="https://rems.csc.fi/Shibboleth.sso/Login" index="1"/>
-            <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" 
-		Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-		Location="https://rems.csc.fi/Shibboleth.sso/Login2" index="2"/> 
-            <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-                <mdui:DisplayName xml:lang="en">REMS</mdui:DisplayName>
-                <mdui:DisplayName xml:lang="fi">REMS</mdui:DisplayName>
-                <mdui:Description xml:lang="en">Resource Entitlement Management
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rems.csc.fi/Shibboleth.sso/Login" index="1"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rems.csc.fi/Shibboleth.sso/Login2" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">REMS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">REMS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Resource Entitlement Management
                     System</mdui:Description>
-                <mdui:Description xml:lang="fi">REMS-palvelun kautta tutkijat voivat hakea käyttöoikeuksia tutkimuksen tietoaineistoihin</mdui:Description>
-                <mdui:PrivacyStatementURL xml:lang="en"
-                    >https://rems.csc.fi/web/guest/privacy-policy</mdui:PrivacyStatementURL>
-                <mdui:PrivacyStatementURL xml:lang="fi"
-                    >https://rems.csc.fi/web/guest/tietosuojaseloste</mdui:PrivacyStatementURL>
-            </mdui:UIInfo>
-        </Extensions>
-        <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>MIIC6DCCAdCgAwIBAgIJAJNkHpbnqskZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+        <mdui:Description xml:lang="fi">REMS-palvelun kautta tutkijat voivat hakea käyttöoikeuksia tutkimuksen tietoaineistoihin</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://rems.csc.fi/web/guest/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://rems.csc.fi/web/guest/tietosuojaseloste</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC6DCCAdCgAwIBAgIJAJNkHpbnqskZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
                         BAMTC3JlbXMuY3NjLmZpMB4XDTEyMTAwNDA2NDc1M1oXDTIyMTAwMjA2NDc1M1ow
                         FjEUMBIGA1UEAxMLcmVtcy5jc2MuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
                         ggEKAoIBAQCti37oqpPuAfgsIAc7VwKA+3L99iuTlFG9jlGTJiurXW/ARwl5y8FX
@@ -49,60 +41,47 @@
                         0iqdiwFeKwjOlKALGVW92ihgU8uX3ScC6jCbAdPTu2m+NBO42pKNVYasHI0PBJmB
                         HCZKDHCPHeGmXn6ab0zU6GbvGrxAKWDwJNw9mgRfxKqvTpVI9hY8QOE4eAjH7UJz
                         c3E0G+pYuKCVKHVH6HOcuVL23IneYlhKtmz+Kw==</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-            Location="https://rems.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-        <AttributeConsumingService index="1" isDefault="true">
-            <ServiceName xml:lang="fi">REMS</ServiceName>
-            <ServiceName xml:lang="en">REMS</ServiceName>
-            <ServiceDescription xml:lang="fi">Valtuutuuksien Hallinta
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rems.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <AttributeConsumingService index="1" isDefault="true">
+      <ServiceName xml:lang="fi">REMS</ServiceName>
+      <ServiceName xml:lang="en">REMS</ServiceName>
+      <ServiceDescription xml:lang="fi">Valtuutuuksien Hallinta
                 Jarjestelma</ServiceDescription>
-            <ServiceDescription xml:lang="en">Resource Entitlement Management
+      <ServiceDescription xml:lang="en">Resource Entitlement Management
                 System</ServiceDescription>
-            <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3"
-                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-            <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241"
-                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-            <RequestedAttribute FriendlyName="eduPersonAffiliation"
-                Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"
-                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-            <RequestedAttribute FriendlyName="eduPersonPrincipalName"
-                Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
-                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-            <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3"
-                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-            <RequestedAttribute FriendlyName="schacHomeOrganization"
-                Name="urn:oid:1.3.6.1.4.1.25178.1.2.9"
-                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-            <RequestedAttribute FriendlyName="schacHomeOrganizationType"
-                Name="urn:oid:1.3.6.1.4.1.25178.1.2.10"
-                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-            <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4"
-                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-        </AttributeConsumingService>
-    </SPSSODescriptor>
-    <Organization>
-        <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-        <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
-        <OrganizationName xml:lang="sv">CSC - IT-centret för vetenskap</OrganizationName>
-        <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-        <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
-        <OrganizationDisplayName xml:lang="sv">CSC - IT-centret för vetenskap</OrganizationDisplayName>
-        <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
-        <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
-        <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Janne</GivenName>
-        <SurName>Lauros</SurName>
-        <EmailAddress>mailto:janne.lauros@csc.fi</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="support">
-        <GivenName>Janne</GivenName>
-        <SurName>Lauros</SurName>
-        <EmailAddress>mailto:janne.lauros@csc.fi</EmailAddress>
-    </ContactPerson>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+    <OrganizationName xml:lang="sv">CSC - IT-centret för vetenskap</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">CSC - IT-centret för vetenskap</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Janne</GivenName>
+    <SurName>Lauros</SurName>
+    <EmailAddress>mailto:janne.lauros@csc.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Janne</GivenName>
+    <SurName>Lauros</SurName>
+    <EmailAddress>mailto:janne.lauros@csc.fi</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/secure.urkund.com.xml b/swamid-2.0/secure.urkund.com.xml
index ff299183..0128bd06 100644
--- a/swamid-2.0/secure.urkund.com.xml
+++ b/swamid-2.0/secure.urkund.com.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:urkund:shibboleth:sp">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -71,13 +72,13 @@ gEln3A==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.urkund.com/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="administrative">
-	<md:GivenName>Peter</md:GivenName>
-	<md:SurName>Witasp</md:SurName>
-	<md:EmailAddress>peter.witasp@prioinfo.se</md:EmailAddress>
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Witasp</md:SurName>
+    <md:EmailAddress>peter.witasp@prioinfo.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-	<md:GivenName>Samuel</md:GivenName>
-	<md:SurName>Otter</md:SurName>
-	<md:EmailAddress>samuel@onposition.com</md:EmailAddress>
+    <md:GivenName>Samuel</md:GivenName>
+    <md:SurName>Otter</md:SurName>
+    <md:EmailAddress>samuel@onposition.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/services.ibistic.net.xml b/swamid-2.0/services.ibistic.net.xml
index a8e9afe4..ff27da2a 100644
--- a/swamid-2.0/services.ibistic.net.xml
+++ b/swamid-2.0/services.ibistic.net.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
diff --git a/swamid-2.0/sgw.africa-grid.org.xml b/swamid-2.0/sgw.africa-grid.org.xml
index 8bcea364..f8f4dc00 100644
--- a/swamid-2.0/sgw.africa-grid.org.xml
+++ b/swamid-2.0/sgw.africa-grid.org.xml
@@ -1,17 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://sgw.africa-grid.org/shibboleth">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-    <mdui:UIInfo>
-    <mdui:DisplayName xml:lang="en">
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">
     Africa Grid Science Gateway
     </mdui:DisplayName>
-    <mdui:DisplayName xml:lang="it">
+        <mdui:DisplayName xml:lang="it">
     Africa Grid Science Gateway
     </mdui:DisplayName>
-    <mdui:Description xml:lang="en">
+        <mdui:Description xml:lang="en">
     This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
      </mdui:Description>
-     <mdui:Description xml:lang="it">
+        <mdui:Description xml:lang="it">
       Questo servizio permette l'accesso e l'uso delle applicazioni/servizi Grid sviluppati per il progetto eI4Africa
       </mdui:Description>
       </mdui:UIInfo>
@@ -19,7 +20,7 @@
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sgw.africa-grid.org/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
-       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>www.catania-science-gateways.it</ds:KeyName>
         <ds:KeyName>aginfra-sg.ct.infn.it</ds:KeyName>
         <ds:KeyName>cogito-med.ct.infn.it</ds:KeyName>
@@ -79,36 +80,29 @@ j/MCNlE=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-
     <md:AttributeConsumingService index="1">
-        <md:ServiceName xml:lang="en">Africa Grid Science Gateway</md:ServiceName>
-        <md:ServiceDescription xml:lang="en">
+      <md:ServiceName xml:lang="en">Africa Grid Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
     This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
         </md:ServiceDescription>
-                                          
-        <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-                            
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
-
-
   </md:SPSSODescriptor>
-
   <md:Organization>
-     <md:OrganizationName xml:lang="en">Consorzio COMETA</md:OrganizationName>
-     <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:GivenName>Marco</md:GivenName>
-      <md:SurName>Fargetta</md:SurName>
-      <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-      <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="administrative">
-      <md:GivenName>Roberto</md:GivenName>
-      <md:SurName>Barbera</md:SurName>
-      <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-      <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-    </md:ContactPerson>
-
+    <md:OrganizationName xml:lang="en">Consorzio COMETA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Fargetta</md:SurName>
+    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/shibboleth.turnitin.com.xml b/swamid-2.0/shibboleth.turnitin.com.xml
index 9c1c2148..ecb1b0d2 100644
--- a/swamid-2.0/shibboleth.turnitin.com.xml
+++ b/swamid-2.0/shibboleth.turnitin.com.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.turnitin.com/shibboleth">
-
   <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.turnitin.com/Shibboleth.sso/Login"/>
@@ -88,5 +87,4 @@ FfnY7V5wsSpLdk49lCnffBRVtwzF0tzt
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.turnitin.com/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.turnitin.com/Shibboleth.sso/SAML/Artifact" index="5"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/shibdev.rsc.org.xml b/swamid-2.0/shibdev.rsc.org.xml
index 153a9faa..11e27ad2 100644
--- a/swamid-2.0/shibdev.rsc.org.xml
+++ b/swamid-2.0/shibdev.rsc.org.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibdev.rsc.org/shibboleth">
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibdev.rsc.org/Shibboleth.sso/Login"/>
@@ -45,5 +45,4 @@ GV51mKkJSvO0CwKUTbSeK9Cn+Y0rAn2Hck2OojCaYY/SeNYkhe0vhQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibdev.rsc.org/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibdev.rsc.org/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/testshib.msacademicverify.com.xml b/swamid-2.0/testshib.msacademicverify.com.xml
index a6a7c7c3..793f45b7 100644
--- a/swamid-2.0/testshib.msacademicverify.com.xml
+++ b/swamid-2.0/testshib.msacademicverify.com.xml
@@ -1,5 +1,5 @@
-
-<EntityDescriptor entityID="https://testshib.msacademicverify.com/shibboleth-sp" xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testshib.msacademicverify.com/shibboleth-sp">
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -8,7 +8,8 @@
     </md:Extensions>
     <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>          <ds:X509Certificate>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIDVDCCAjygAwIBAgIJAJh4QX82u2pTMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
 BAMTHXRlc3RzaGliLm1zYWNhZGVtaWN2ZXJpZnkuY29tMB4XDTEzMDMyNjEzMTIw
 N1oXDTE2MDMyNTEzMTIwN1owKDEmMCQGA1UEAxMddGVzdHNoaWIubXNhY2FkZW1p
@@ -58,4 +59,4 @@ wWE+vceD2r7oFUYHr1E07cyX20HwNU1LL3TthPaNhs7M2ImLlYHapw==
     <GivenName>Tushar Nene</GivenName>
     <EmailAddress>Tushar.Nene@microsoft.com</EmailAddress>
   </ContactPerson>
-</EntityDescriptor>
-\ No newline at end of file
+</EntityDescriptor>
diff --git a/swamid-2.0/ugit.se.xml b/swamid-2.0/ugit.se.xml
index 41c67d35..b9281661 100644
--- a/swamid-2.0/ugit.se.xml
+++ b/swamid-2.0/ugit.se.xml
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ugit.se/sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
-          NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-          Name="http://macedir.org/entity-category">
-          <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-       </samla:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
     <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
       <mdui:DisplayName xml:lang="en">UGIT</mdui:DisplayName>
diff --git a/swamid-2.0/uninett-box-idp.nordu.net-idp.xml b/swamid-2.0/uninett-box-idp.nordu.net-idp.xml
index 5da7eed0..59dea35c 100644
--- a/swamid-2.0/uninett-box-idp.nordu.net-idp.xml
+++ b/swamid-2.0/uninett-box-idp.nordu.net-idp.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://uninett-box-idp.nordu.net/simplesaml/saml2/idp/metadata.php">
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDUjCCAjqgAwIBAgIJAP0S1dNRGg/AMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXVuaW5ldHQtYm94LmlkcC5ub3JkdS5uZXQwHhcNMTMwNTE2MDc1MTEwWhcNMTMwNjE1MDc1MTEwWjAkMSIwIAYDVQQDExl1bmluZXR0LWJveC5pZHAubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv0w07k9ULBMn+ASu2Z4wsEtoF7MzEqOxvIEK3fuH80mxiS6G+Tn7cTibeaw3zLlUswtuiH1TfT4JoqfyI0HhKG0kdDAFQ4beFFOfHJ8W//lDPr5q5rl4O+KXURZ5w7nVULDfSlzjM9k0VMUwgteJySWokRWDjdDo6gRi78X7F61wyx11nUBccH3Ah3wjc21eWb2K+OHid0+xgdTOC+fLET8GLJMhE51euDv099NBmmVKD0K+US9UlaJ7UlsNdU5fTj46/sWtjt11RXQayYOX8qwlydeCJgi+cniNkglVs4sc+D10XItbckRz6igDNekO+3tdEWIftfRmL6ODTb/YjQIDAQABo4GGMIGDMB0GA1UdDgQWBBTCPo7hkQeaWm11qZapoaaAuuAWxzBUBgNVHSMETTBLgBTCPo7hkQeaWm11qZapoaaAuuAWx6EopCYwJDEiMCAGA1UEAxMZdW5pbmV0dC1ib3guaWRwLm5vcmR1Lm5ldIIJAP0S1dNRGg/AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKVU7z5RbyFFr2JFDUEXu/gVPb+aGsxe52OupWIAmzw/TomK0QOewoQMroggzkCkOqfPXl1g4oLM6d/7rqHInmZJvEvX8ExdN0xFQTujVc50EmUpqCV+LwU3hRpGTCRjE85xrkZouALUMlLPfZcFiiCXk2Wxq0w57/th4toDnyn9dfa0zjNkGoH/Y62X1QGak5naiPNeOjkk31T0fITagJSUtZRJeBZbutfaSqB0SHct+O4rf6z8n297psHANv2U9XI1NiXiTAE76J8vWKQT1iJr5n5i3MKsRyQknl44eQ+q7VYvFLVJUgl7lafmR55fyOOyv33NKIF7g9miJGZ29EE=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDUjCCAjqgAwIBAgIJAP0S1dNRGg/AMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXVuaW5ldHQtYm94LmlkcC5ub3JkdS5uZXQwHhcNMTMwNTE2MDc1MTEwWhcNMTMwNjE1MDc1MTEwWjAkMSIwIAYDVQQDExl1bmluZXR0LWJveC5pZHAubm9yZHUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv0w07k9ULBMn+ASu2Z4wsEtoF7MzEqOxvIEK3fuH80mxiS6G+Tn7cTibeaw3zLlUswtuiH1TfT4JoqfyI0HhKG0kdDAFQ4beFFOfHJ8W//lDPr5q5rl4O+KXURZ5w7nVULDfSlzjM9k0VMUwgteJySWokRWDjdDo6gRi78X7F61wyx11nUBccH3Ah3wjc21eWb2K+OHid0+xgdTOC+fLET8GLJMhE51euDv099NBmmVKD0K+US9UlaJ7UlsNdU5fTj46/sWtjt11RXQayYOX8qwlydeCJgi+cniNkglVs4sc+D10XItbckRz6igDNekO+3tdEWIftfRmL6ODTb/YjQIDAQABo4GGMIGDMB0GA1UdDgQWBBTCPo7hkQeaWm11qZapoaaAuuAWxzBUBgNVHSMETTBLgBTCPo7hkQeaWm11qZapoaaAuuAWx6EopCYwJDEiMCAGA1UEAxMZdW5pbmV0dC1ib3guaWRwLm5vcmR1Lm5ldIIJAP0S1dNRGg/AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKVU7z5RbyFFr2JFDUEXu/gVPb+aGsxe52OupWIAmzw/TomK0QOewoQMroggzkCkOqfPXl1g4oLM6d/7rqHInmZJvEvX8ExdN0xFQTujVc50EmUpqCV+LwU3hRpGTCRjE85xrkZouALUMlLPfZcFiiCXk2Wxq0w57/th4toDnyn9dfa0zjNkGoH/Y62X1QGak5naiPNeOjkk31T0fITagJSUtZRJeBZbutfaSqB0SHct+O4rf6z8n297psHANv2U9XI1NiXiTAE76J8vWKQT1iJr5n5i3MKsRyQknl44eQ+q7VYvFLVJUgl7lafmR55fyOOyv33NKIF7g9miJGZ29EE=</ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-2.0/uninett-box-idp.nordu.net.xml b/swamid-2.0/uninett-box-idp.nordu.net.xml
index f76c9c66..060317fc 100644
--- a/swamid-2.0/uninett-box-idp.nordu.net.xml
+++ b/swamid-2.0/uninett-box-idp.nordu.net.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uninett-box-idp.nordu.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
@@ -21,15 +22,15 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uninett-box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://uninett-box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="4"/>
     <md:AttributeConsumingService index="0">
-       <md:ServiceName xml:lang="en">UNINETT Box</md:ServiceName>
-       <md:ServiceDescription xml:lang="en">UNINETT Box</md:ServiceDescription>
-       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" Name="urn:oid:2.5.4.42"/>
-       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241"/>
-       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" Name="urn:oid:2.5.4.4"/>
-       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
-       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+      <md:ServiceName xml:lang="en">UNINETT Box</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">UNINETT Box</md:ServiceDescription>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" Name="urn:oid:2.5.4.42"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" Name="urn:oid:2.5.4.4"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="technical">
diff --git a/swamid-2.0/uraccess.se.xml b/swamid-2.0/uraccess.se.xml
index 81faff41..c505c461 100644
--- a/swamid-2.0/uraccess.se.xml
+++ b/swamid-2.0/uraccess.se.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uraccess.se/shibboleth-sp">
   <md:Extensions>
-     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-          <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-       </samla:Attribute>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
diff --git a/swamid-2.0/webinar.nordu.net.xml b/swamid-2.0/webinar.nordu.net.xml
index 0731cef2..e1d2bdc1 100644
--- a/swamid-2.0/webinar.nordu.net.xml
+++ b/swamid-2.0/webinar.nordu.net.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webinar.nordu.net/shibboleth">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
@@ -53,14 +54,14 @@ euZKcqmem+nEk8ZZsFxhsTwGLzwlgA+2TEJnP3AeRTiPLzvbYTUprgL0gKt7pg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webinar.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webinar.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="0">
-       <md:ServiceName xml:lang="en">NORDUnet Webinar Service</md:ServiceName>
-       <md:ServiceDescription xml:lang="en">NORDUnet Webinar Service (Adobe Connect)</md:ServiceDescription>
-       <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
-       <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
-       <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
-       <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
-       <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
-       <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
+      <md:ServiceName xml:lang="en">NORDUnet Webinar Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">NORDUnet Webinar Service (Adobe Connect)</md:ServiceDescription>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+      <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-2.0/wp.nordu.net.xml b/swamid-2.0/wp.nordu.net.xml
index f3be3a7b..889a41bd 100644
--- a/swamid-2.0/wp.nordu.net.xml
+++ b/swamid-2.0/wp.nordu.net.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://wp.nordu.net/shibboleth">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
diff --git a/swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml b/swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml
index fe50aa88..c5de4138 100644
--- a/swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-stage.ladok3.its.umu.se/gui-sp">
-
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -28,7 +27,6 @@ and do *NOT* provide it in real time to your partners.
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-stage.ladok3.its.umu.se/Shibboleth.sso/Login"/>
@@ -84,5 +82,4 @@ WeqXrnHqvgkhvU9Xbex0UPo0tJ+WaKA=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-stage.ladok3.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-stage.ladok3.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml b/swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml
index 7f3aeb83..699c4843 100644
--- a/swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-utb.ladok3.its.umu.se/gui-sp">
-
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -24,7 +23,6 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-utb.ladok3.its.umu.se/Shibboleth.sso/Login"/>
@@ -80,5 +78,4 @@ HCJqLLaJwhW98zEnNf0DCRdbDeEV1hoW8kZG9l3Mb1K6mOBCL/SUPDb9CzJ7timi
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-utb.ladok3.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-utb.ladok3.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.akademiskahogtider.se.xml b/swamid-2.0/www.akademiskahogtider.se.xml
index b7a44b74..bc406b7b 100644
--- a/swamid-2.0/www.akademiskahogtider.se.xml
+++ b/swamid-2.0/www.akademiskahogtider.se.xml
@@ -1,13 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.akademiskahogtider.se/shibboleth">
   <md:Extensions>
-     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
-          NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-          Name="http://macedir.org/entity-category">
-          <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-       </samla:Attribute>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
diff --git a/swamid-2.0/www.ifmsa.se.xml b/swamid-2.0/www.ifmsa.se.xml
index aa831e70..ab70dc30 100644
--- a/swamid-2.0/www.ifmsa.se.xml
+++ b/swamid-2.0/www.ifmsa.se.xml
@@ -1,16 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ifmsa.se/sp">
-
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
-          NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-          Name="http://macedir.org/entity-category">
-          <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-          <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-        </samla:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ifmsa.se/Shibboleth.sso/DS/ds.swamid.se"/>
@@ -57,7 +54,6 @@ X40wJ5KGvRmsxTM5VbkQ8wS7EWuIkQG/iXCyD+b1BExCsuXvX3nN24bsBLUtV8wE
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ifmsa.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ifmsa.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
   <md:Organization>
     <md:OrganizationName xml:lang="en">IFMSA-Sweden</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">IFMSA-Sweden</md:OrganizationDisplayName>
diff --git a/swamid-2.0/www.mit.ladok.se-gui-sp.xml b/swamid-2.0/www.mit.ladok.se-gui-sp.xml
index f917cd50..5d95ce49 100644
--- a/swamid-2.0/www.mit.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.mit.ladok.se-gui-sp.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.mit.ladok.se/gui-sp">
-
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -25,7 +24,6 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.mit.ladok.se/Shibboleth.sso/Login"/>
@@ -80,5 +78,4 @@ hiXdvSpPHS4gwfMsYQ0SMmpyUlBMG0J8lN57vA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-
 </md:EntityDescriptor>
author	Leif Johansson <leifj@sunet.se>	2013-06-16 20:25:53 +0200
committer	Leif Johansson <leifj@sunet.se>	2013-06-16 20:25:53 +0200
commit	b217869b73c7ceb7653972740e0f796cf9bbd383 (patch)
tree	ca10c13dc56d3c1665f5e89759e91ede7489bffc /swamid-2.0
parent	5b14805f2ecc3b89ea0ff9b08a8714a3b895347e (diff)
parent	c5391135cbba3c20214e9e44c433925931df1453 (diff)