Merge pull request #132 from Edugate/develop

arp xml - remain only elements where PermitValueRule is set
Merge branch 'develop' into 1.x-stable
Merge branch 'develop' into 1.x-stable
Merge branch 'develop' into 1.x-stable
Merge branch 'develop' into 1.x-stable
Merge branch 'develop' into 1.x-stable
new matrixidp