Merge remote-tracking branch 'origin/main' into feature/#182-reset-password

# Conflicts:
#	src/utilities/http.ts

src/services/userService.ts

@@ -33,6 +33,7 @@ class UserService {
   /**
    * Register user
    * @param username
+   * @param email
    * @param password
    */
   async register(username: string, email: string, password: string): Promise<boolean | User> {