merge dev into testing

Sabine Schröderrequested to merge
dev into testing

merge all ontology developments into three main project branches (dev, testing, master=operational)

Merge request reports