Working on SSO/AD integration
Merge pull request #880 from emmanuel-keller/1.5

Working on SSO/AD integration