ADFS
Merge branch 'ADFS-Service' of github.com:persistentsystems/solutions-import-beta into ADFS-Service