Adaptation for new ontology.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
SPARQL rebuild to match the new implementation of the ontology.