Merge branch 'master' into simon/bisq-dashboard

# Conflicts:
#	frontend/package-lock.json
#	frontend/src/app/components/master-page/master-page.component.html

frontend/src/app/interfaces/websocket.interface.ts

@@ -16,6 +16,7 @@ export interface WebsocketResponse {
   rbfTransaction?: Transaction;
   transactions?: TransactionStripped[];
   loadingIndicators?: ILoadingIndicators;
+  backendInfo?: IBackendInfo;
   'track-tx'?: string;
   'track-address'?: string;
   'track-asset'?: string;
@@ -50,3 +51,8 @@ export interface TransactionStripped {
   value: number;
 }
 
+export interface IBackendInfo {
+  hostname: string;
+  gitCommit: string;
+  version: string;
+}