added doc ID to feature list
Merge branch 'master' of https://nilsrethmeier@github.com/fatschi/art.git

Conflicts:
	src/de/uni_potsdam/de/hpi/fgnaumann/art/featureGeneration/DatabaseExtractor.java
Merge branch 'master' of https://github.com/fatschi/art

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