Added yubikey support.
Added yubikey support.
Merge branch 'test' into dev
merged yubikey support.