Fixed conflict
New classifier to replace FactExtractor
Merge branch '281-experimentation-up-to-date' into develop