restore from QR done
small fixes
Merge branch 'basewallet' of https://github.com/negedzuregal/BitcoinAuthWallet into basewallet

Conflicts:
	wallet.jar