encryption fix
final encryption fix
Merge branch 'basewallet' of https://github.com/negedzuregal/BitcoinAuthWallet into basewallet