Fixed blocking
Merge branch 'tommy'
further work on entity mapping
further work on Entity Mapping
Refactored entity mapping data structures to comply with Sopremo standards
Fixed SNM compilation error
fixed bug in transitive value correspondences
further bug fixing in transitive value correspondences
Merge branch 'master' of https://github.com/AHeise/sopremo-cleansing

Conflicts:
	src/main/java/eu/stratosphere/sopremo/cleansing/mapping/EntityMapping.java
	src/main/java/eu/stratosphere/sopremo/cleansing/mapping/MappingSchema.java
Merge branch 'master' of https://github.com/AHeise/sopremo-cleansing
EntityMappingIt is running