Solve merge TODOs
Remove dead class AutomaticDmsExport
Merge pull request #254 from matthias-ronge/merge_todos

Merge todos