Merge pull request #1446 from shekenahglory/release

[FIX] 2fa: ECDSA to HMAC on 2fa get, fix bugs
[FIX] keychain: reset password timeout to 5 minutes
[FIX] 2FA: correctly populate country code from authy dropdown