Fix import wallet, and refresh account
merge from origin/master