Added cac support
Fixed issue in sso_cac
Merge branch 'master' into development