_
Merge branch 'master' of https://github.com/gillesB/semantischeOperabilitaet2013

Conflicts:
	SI-Hauptprojekt/src/resources/de/htw/owl/catalog-v001.xml