Merging ontology changes from filters branch
Merge branch 'dev' of https://github.com/chb/smart_common into dev