hibernate Linktype, minor adaptions
Merge branch 'master' of https://github.com/AKSW/LinkingLodPortal

Conflicts:
	src/main/java/de/linkinglod/io/MappingProcessor.java