Merge branch 'master' of https://github.com/dbpedia/extraction-framework
Merge branch 'master' of https://github.com/ninniuz/extraction-framework