Develop

Mathias Goebelrequested to merge
develop into master

hotfix removed app.xql still imported at view.xql

Merge request reports