Merge branch 'next' into new-forms

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

# Conflicts:
#	web/src/api/legacy.ts
#	web/src/main.ts
#	web/src/pages/users/UserSettingsPage.ts

web/src/api/legacy.ts

@@ -113,4 +113,8 @@ export class FlowURLManager {
         return `/flows/-/configure/${stageUuid}/${rest}`;
     }
 
+    static cancel(): string {
+        return "/flows/-/cancel/";
+    }
+
 }