merge testing into master

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