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
added grouping with grouping keys generated by functions (e.g. concatenation)
Merge branch 'master' of https://github.com/AHeise/sopremo-cleansing
set RBF internal
set RBS internal
Merge branch 'master' of https://github.com/AHeise/sopremo-cleansing
Merge branch 'master' of https://github.com/fatschi/sopremo-cleansing
Merge branch 'master' of https://github.com/AHeise/sopremo-cleansing

Conflicts:
	src/main/java/eu/stratosphere/sopremo/cleansing/scrubbing/RuleBasedScrubbing.java
added failing tests for embedded key references see(https://github.com/AHeise/sopremo-cleansing/issues/20)
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
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
Merge pull request #24 from fatschi/master

Entity Mapping Refactoring