refactoring
Merge branch 'master' of https://github.com/fatschi/art

Conflicts:
	src/de/uni_potsdam/de/hpi/fgnaumann/art/featureGeneration/AllFeaturesDatabaseExtractor.java