merged branch fabi:master
fixed some of the testcases
further fixing of test cases MeteorParserEntittyMappingTest
Merge branch 'master' of https://github.com/Tommy-Neubert/sopremo-cleansing

Conflicts:
	src/test/java/eu/stratosphere/sopremo/cleansing/mapping/MeteorParserEntityMappingTest.java