Bugfix
Merge branch 'automator' of github.com:PDI-DGS-Protolab/backoffice_process_manager into automator
solve merging conflicts