Extended ontology
Merge branch 'dev' of https://github.com/FITeagle/api into dev