Mapping, Link, LinkType, EntityObject working (Hibernate)
Merge branch 'master' of https://github.com/AKSW/LinkingLodPortal

Conflicts:
	src/main/java/de/linkinglod/service/DataGenerator.java