PLINK-125 document authenticator selection and multiple authenticator support
Merge branch 'master' of github.com:picketlink/picketlink
Merge remote-tracking branch 'upstream/master'