white list/black list
Merge branch 'master' into csv-import

Conflicts:
	core/core/src/main/resources/io/lumify/core/model/ontology/base.owl