Merge branch 'development' of https://github.com/InformationIntegrationGroup/dig-alignment into development

Conflicts:
	karma/preloaded-ontologies/memex-ontology.ttl