Merge pull request #770 from patriot1burke/master

saml signatures
saml encryption
Merge remote-tracking branch 'upstream/master'