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

Conflicts:
	swamid-sp-2.0.mxml

diff --cc swamid-sp-2.0.mxml
index 7703e66,8903998..28ae4b1
--- 1/swamid-sp-2.0.mxml
--- 2/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@@ -459,5 -460,6 +459,7 @@@
    <xi:include href="swamid-2.0/internt.geol.lu.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/www.ate.uppfoljning.ladok.se-gui-sp.xml"/>
    <xi:include href="swamid-2.0/play.hkr.se.xml"/>
 +  <xi:include href="swamid-2.0/saml.salesforce.com-sunet-sandbox.xml"/>
+   <xi:include href="swamid-2.0/play.smdb.kb.se.xml"/>
+   <xi:include href="swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml"/>
  </md:EntitiesDescriptor>