Merge branch 'master' of https://github.com/AHeise/sopremo-cleansing
Merge branch 'master' of https://github.com/AHeise/sopremo-cleansing
deleted useless condition in RuleBasedScrubbing
Merge branch 'master' of https://github.com/fatschi/sopremo-cleansing

Conflicts:
	src/test/resources/ScrubbingIT.script
Merge branch 'master' of https://github.com/AHeise/sopremo-cleansing
Merge branch 'master' of https://github.com/AHeise/sopremo-cleansing
Merge branch 'master' of https://github.com/fatschi/sopremo-cleansing
Fixed SNM RL
Merge branch 'master' of github.com:AHeise/sopremo-cleansing
added resources for complex object scrubbing testcase
added TODO to show place to fix complex object scrubbing bug
Merge branch 'master' of https://github.com/fatschi/sopremo-cleansing
Fixed merge
Merge branch 'master' of https://github.com/AHeise/sopremo-cleansing

Conflicts:
	src/test/java/eu/stratosphere/sopremo/cleansing/record_linkage/DuplicateDetectionIT.java
Merge branch 'master' of https://github.com/Tommy-Neubert/sopremo-cleansing
added failing parse test for RL with SNM