syncing
Merge branch 'master' of https://github.com/ontohub/OOR_Ontohub_API

Conflicts:
	catalog-v001.xml
Merge branch 'master' of https://github.com/ontohub/OOR_Ontohub_API