Adapted to removal of QuerySpecification.
Merge branch 'master' of https://github.com/uzh/triplerush-evaluation

Conflicts:

src/main/scala/com/signalcollect/triplerush/evaluation/demo/DbpediaDemo.
scala

src/main/scala/com/signalcollect/triplerush/evaluation/demo/LocalDbpedia
Demo.scala