Updates to the ontology and manifest tests
Merge branch 'dev'

Conflicts:
	schema/smart.owl