Merge branch 'main' into 'dock'

# Conflicts:
#   db/toco_soap.sql
#   docker-compose.yml
#   dockerfile
#   pom.xml
#   src/main/java/org/toco/Main.java
#   src/main/java/org/toco/service/transaction.java
#   src/main/java/org/toco/service/userGems.java