Merge branch 'release' into hotfix/restructure_merge

# Conflicts:
#	README.md
#	api/client.go
#	api/version_vars.go
#	auth/callback.go
#	auth/cmix.go
#	auth/confirm.go
#	auth/request.go
#	backup/backup.go
#	backup/backup_test.go
#	bindings/fileTransfer.go
#	bindings/notifications.go
#	bindings/restoreContacts.go
#	bindings/ud.go
#	cmd/fileTransfer.go
#	cmix/gateway/hostPool.go
#	fileTransfer/manager.go
#	fileTransfer/oldTransferRecovery.go
#	fileTransfer/receive.go
#	fileTransfer/send.go
#	fileTransfer/sendNew.go
#	fileTransfer/send_test.go
#	fileTransfer2/sentRoundTracker/sentRoundTracker.go
#	go.mod
#	go.sum
#	groupChat/receive.go
#	interfaces/preimage/generate.go
#	interfaces/preimage/types.go
#	network/manager.go
#	network/message/garbled.go
#	network/message/handler.go
#	network/message/manager.go
#	network/message/sendCmix.go
#	network/message/sendManyCmix.go
#	network/node/register.go
#	network/rounds/check.go
#	network/rounds/historical.go
#	storage/auth/store.go
#	storage/e2e/store.go
#	storage/fileTransfer/receiveFileTransfers.go
#	storage/fileTransfer/receiveFileTransfers_test.go
#	storage/fileTransfer/sentFileTransfers.go
#	storage/fileTransfer/sentFileTransfers_test.go
#	ud/manager.go
#	ud/registered.go
#	ud/store/facts.go
#	ud/store/facts_test.go
#	xxmutils/restoreContacts.go

cmd/ud.go

@@ -181,7 +181,7 @@ var udCmd = &cobra.Command{
 				jww.FATAL.Panicf("BATCHADD: Couldn't read file: %+v", err)
 			}
 			restored, _, _, err := xxmutils.RestoreContactsFromBackup(
-				idListFile, client, userDiscoveryMgr, nil)
+				idListFile, client, userDiscoveryMgr, nil, nil)
 			if err != nil {
 				jww.FATAL.Panicf("%+v", err)
 			}