Merge remote-tracking branch 'origin/master' into dev_claudia

Conflicts:
	backend/src/test/java/de/uni_potsdam/hpi/metanome/algorithm_loading/AlgorithmFinderTest.java
Merge branch 'dev_claudia' of
git@github.com:HPI-Information-Systems/Metanome.git into dev_claudia