Merge branch 'develop' into feature/merge-develop-version2-041114 (not yet fully finished)

Conflicts:
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/BinaryAssertion.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/ClassDescription.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/Datatype.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/FunctionalPropertyAxiom.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/ObjectPropertyAssertion.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/Property.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/PropertyAssertion.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/PropertyExpression.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/PropertySomeClassRestriction.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/PropertySomeDataTypeRestriction.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/PropertySomeRestriction.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/SomeValuesFrom.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/SubClassOfAxiom.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/SubPropertyOfAxiom.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/impl/DataTypeImpl.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/impl/DatatypeImpl.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/impl/DisjointClassAxiomImpl.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/impl/DisjointClassesAxiomImpl.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/impl/DisjointPropertiesAxiomImpl.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/impl/DisjointPropertyAxiomImpl.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/impl/FunctionalPropertyAxiomImpl.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/impl/ObjectPropertyAssertionImpl.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/impl/PropertyAssertionImpl.java
	obdalib-core/src/main/java/it/unibz/krdb/obda/ontology/impl/PropertyFunctionalAxiomImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/model/OBDAModel.java
	obdalib-core/src/main/java/org/semanticweb/ontop/model/Predicate.java
	obdalib-core/src/main/java/org/semanticweb/ontop/model/impl/OBDAModelImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/model/impl/OBDAVocabulary.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/Assertion.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/BasicClassDescription.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/BinaryAssertion.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/ClassAssertion.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/ClassDescription.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/DataPropertyAssertion.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/DataType.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/DisjointClassAxiom.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/DisjointDataPropertyAxiom.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/DisjointDescriptionAxiom.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/DisjointObjectPropertyAxiom.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/DisjointPropertyAxiom.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/ObjectPropertyAssertion.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/OntologyFactory.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/Property.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/PropertyFunctionalAxiom.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/PropertySomeClassRestriction.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/PropertySomeDataTypeRestriction.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/PropertySomeRestriction.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/SubDescriptionAxiom.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/UnaryAssertion.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/AbstractSubDescriptionAxiom.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/ClassAssertionImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/DataPropertyAssertionImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/DataTypeImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/DisjointClassAxiomImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/DisjointDataPropertyAxiomImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/DisjointObjectPropertyAxiomImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/DisjointPropertyAxiomImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/ObjectPropertyAssertionImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/OntologyFactoryImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/OntologyImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/PropertyFunctionalAxiomImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/PropertyImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/PropertySomeClassRestrictionImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/PropertySomeDataTypeRestrictionImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/PropertySomeRestrictionImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/SubClassAxiomImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/ontology/impl/SubPropertyAxiomImpl.java
	obdalib-core/src/main/java/org/semanticweb/ontop/parser/DatalogParser.java
	obdalib-core/src/main/java/org/semanticweb/ontop/parser/TurtleOBDALexer.java
	obdalib-core/src/main/java/org/semanticweb/ontop/parser/TurtleOBDAParser.java
	obdalib-core/src/main/java/org/semanticweb/ontop/parser/TurtleParser.java
	obdalib-owlapi3/src/main/java/org/semanticweb/ontop/owlapi3/OBDAModelSynchronizer.java
	obdalib-owlapi3/src/main/java/org/semanticweb/ontop/owlapi3/OWLAPI3ABoxIterator.java
	obdalib-owlapi3/src/main/java/org/semanticweb/ontop/owlapi3/OWLAPI3IndividualTranslator.java
	obdalib-owlapi3/src/main/java/org/semanticweb/ontop/owlapi3/OWLAPI3Translator.java
	obdalib-owlapi3/src/main/java/org/semanticweb/ontop/owlapi3/TargetQueryValidator.java
	obdalib-owlapi3/src/main/java/org/semanticweb/ontop/owlapi3/directmapping/DirectMappingEngine.java
	obdalib-protege41/src/main/java/org/semanticweb/ontop/protege4/core/OBDAModelManager.java
	obdalib-protege41/src/main/java/org/semanticweb/ontop/protege4/gui/action/OBDADataQueryAction.java
	obdalib-protege41/src/main/java/org/semanticweb/ontop/protege4/gui/component/PropertyMappingPanel.java
	obdalib-protege41/src/main/java/org/semanticweb/ontop/protege4/panels/MappingAssistantPanel.java
	obdalib-protege41/src/main/java/org/semanticweb/ontop/protege4/views/QueryInterfaceView.java
	obdalib-protege41/src/test/java/org/semanticweb/ontop/api/io/ModelIOManagerUsingOwlTest.java
	obdalib-sesame/src/main/java/org/semanticweb/ontop/sesame/SesameRDFIterator.java
	obdalib-sesame/src/main/java/org/semanticweb/ontop/sesame/SesameStatement.java
	quest-db/src/main/java/org/semanticweb/ontop/owlrefplatform/core/QuestDBStatement.java
	quest-db/src/main/java/org/semanticweb/ontop/owlrefplatform/questdb/QuestDBClassicStore.java
	quest-owlapi3/pom.xml
	quest-owlapi3/src/main/java/org/semanticweb/ontop/owlrefplatform/owlapi3/QuestOWL.java
	quest-owlapi3/src/main/java/org/semanticweb/ontop/owlrefplatform/owlapi3/QuestOWLEmptyEntitiesChecker.java
	quest-owlapi3/src/main/java/org/semanticweb/ontop/owlrefplatform/owlapi3/QuestOWLStatement.java
	quest-owlapi3/src/test/java/it/unibz/krdb/obda/quest/dag/S_EquivalenceOverNamed_TestNewDAG.java
	quest-owlapi3/src/test/java/it/unibz/krdb/obda/quest/dag/TestTBoxReasonerImpl_Named.java
	quest-owlapi3/src/test/java/it/unibz/krdb/obda/quest/dag/TestTBoxReasonerImpl_OnGraph.java
	quest-owlapi3/src/test/java/it/unibz/krdb/obda/quest/dag/TestTBoxReasonerImpl_OnNamedDAG.java
	quest-owlapi3/src/test/java/it/unibz/krdb/obda/reformulation/tests/OWLAPI2ABoxIteratorTest.java
	quest-owlapi3/src/test/java/it/unibz/krdb/obda/reformulation/tests/OWLAPI2VocabularyExtractorTest.java
	quest-owlapi3/src/test/java/it/unibz/krdb/obda/reformulation/tests/OWLAPI3ABoxIteratorTest.java
	quest-owlapi3/src/test/java/it/unibz/krdb/obda/reformulation/tests/OWLAPI3VocabularyExtractorTest.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/obda/quest/dag/DAGLoopTest.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/quest/dag/R_TBoxReasonerImpl.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/quest/dag/S_Equivalences_TestNewDAG.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/quest/dag/S_HierarchyTestNewDAG.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/quest/dag/S_Indexes_Compare.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/quest/dag/S_Indexes_TestNewDAG.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/quest/dag/S_TestTransitiveReduction.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/reformulation/semindex/tests/DAGChainTest.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/reformulation/semindex/tests/DAGTest.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/reformulation/semindex/tests/SemanticIndexHelper.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/reformulation/semindex/tests/SemanticReductionTest.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/reformulation/semindex/tests/YAGOTest.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/reformulation/tests/DAGEquivalenceTest.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/reformulation/tests/DAGHierarchyTest.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/reformulation/tests/EquivalenceSimplificationTest.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/reformulation/tests/OWLAPI2ABoxIteratorTest.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/reformulation/tests/OWLAPI2VocabularyExtractorTest.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/reformulation/tests/QuestOWLMaterializerTest.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/reformulation/tests/SigmaTest.java
	quest-owlapi3/src/test/java/org/semanticweb/ontop/reformulation/tests/TranslatorTest.java
	quest-sesame/src/main/java/org/semanticweb/ontop/sesame/SemanticIndexManager.java
	quest-sesame/src/main/java/org/semanticweb/ontop/sesame/SesameAbstractRepo.java
	quest-sesame/src/main/java/org/semanticweb/ontop/sesame/SesameBooleanQuery.java
	quest-sesame/src/main/java/org/semanticweb/ontop/sesame/SesameGraphQuery.java
	quest-sesame/src/main/java/org/semanticweb/ontop/sesame/SesameTupleQuery.java
	quest-sparql-compliance/src/main/resources/testcases-dawg-quest/data-r2/manifest-evaluation.ttl
	quest-test/src/test/java/org/semanticweb/ontop/obda/EmptyEntitiesTest.java
	quest-test/src/test/java/org/semanticweb/ontop/obda/ImdbTestPostgres.java
	quest-test/src/test/java/org/semanticweb/ontop/obda/OntologyTypesTest.java
	quest-test/src/test/java/org/semanticweb/ontop/r2rml/R2rmlCheckerTest.java
	reformulation-core/src/main/java/it/unibz/krdb/obda/owlrefplatform/core/basicoperations/QueryVocabularyValidator.java
	reformulation-core/src/main/java/it/unibz/krdb/obda/owlrefplatform/core/basicoperations/VocabularyValidator.java
	reformulation-core/src/main/java/it/unibz/krdb/obda/owlrefplatform/core/sql/SQLGenerator.java
	reformulation-core/src/main/java/it/unibz/krdb/obda/owlrefplatform/core/unfolding/DatalogUnfolder.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/EquivalenceMap.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/Quest.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/QuestConnection.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/QuestStatement.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/QuestUnfolder.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/abox/ABoxToFactRuleConverter.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/abox/EquivalentTriplePredicateIterator.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/abox/NTripleAssertionIterator.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/abox/QuestMaterializer.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/abox/RDBMSSIRepositoryManager.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/abox/SemanticIndexRecord.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/basicoperations/AxiomToRuleTranslator.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/basicoperations/CQCUtilities.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/basicoperations/CQCWorkerThread.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/basicoperations/DatalogNormalizer.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/basicoperations/PositiveInclusionApplicator.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/basicoperations/QueryAnonymizer.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/basicoperations/QueryVocabularyValidator.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/basicoperations/SemanticQueryOptimizer.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/basicoperations/Substitution.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/basicoperations/Unifier.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/basicoperations/UriTemplateMatcher.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/dag/DAG.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/dag/DAGChain.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/dag/DAGConstructor.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/dag/DAGEdgeIterator.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/dag/DAGNode.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/dag/DAGOperations.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/dag/GraphGenerator.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/dag/SemanticIndex.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/dag/TBoxDAG.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/dag/TestDAG.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/dagjgrapht/NamedDAG.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/dagjgrapht/OntologyGraph.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/dagjgrapht/SemanticIndexBuilder.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/dagjgrapht/SemanticIndexCache.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/dagjgrapht/TBoxReasoner.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/dagjgrapht/TBoxReasonerImpl.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/mappingprocessing/MappingDataTypeRepair.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/mappingprocessing/MappingVocabularyTranslator.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/mappingprocessing/TMappingProcessor.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/mappingprocessing/TMappingRule.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/queryevaluation/Mysql2SQLDialectAdapter.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/reformulation/DLRPerfectReformulator.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/reformulation/DatalogQueryServices.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/reformulation/DummyReformulator.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/reformulation/MinimalCQProducer.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/reformulation/QueryConnectedComponent.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/reformulation/QueryFolding.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/reformulation/QueryRewriter.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/reformulation/TreeRedReformulator.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/reformulation/TreeWitness.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/reformulation/TreeWitnessGenerator.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/reformulation/TreeWitnessReasonerCache.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/reformulation/TreeWitnessRewriter.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/reformulation/TreeWitnessSet.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/resultset/QuestGraphResultSet.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/resultset/QuestResultset.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/srcquerygeneration/SQLQueryGenerator.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/tboxprocessing/EquivalenceTBoxOptimizer.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/tboxprocessing/SigmaTBoxOptimizer.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/tboxprocessing/TBoxReasonerToOntology.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/tboxprocessing/TBoxTraversal.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/tboxprocessing/TBoxTraverseListener.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/tboxprocessing/VocabularyExtractor.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/translator/MappingVocabularyRepair.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/translator/SparqlAlgebraToDatalogTranslator.java
	reformulation-core/src/main/java/org/semanticweb/ontop/owlrefplatform/core/unfolding/ExpressionEvaluator.java
	reformulation-core/src/test/java/org/semanticweb/ontop/owlrefplatform/UnificationTest2.java
	reformulation-core/src/test/java/org/semanticweb/ontop/owlrefplatform/core/abox/NTripleAssertionIteratorTest.java
	reformulation-core/src/test/java/org/semanticweb/ontop/partialEvaluation/test/ThetaApplicationTest.java
	reformulation-core/src/test/java/org/semanticweb/ontop/reformulation/tests/AutomaticMGUGenerationTests.java
	reformulation-core/src/test/java/org/semanticweb/ontop/reformulation/tests/AutomaticMGUTestDataGenerator.java
	reformulation-core/src/test/java/org/semanticweb/ontop/reformulation/tests/CQCUtilitiesTest.java
	reformulation-core/src/test/java/org/semanticweb/ontop/reformulation/tests/PositiveInclusionApplicatorTest.java
	reformulation-core/src/test/java/org/semanticweb/ontop/reformulation/tests/ThetaGenerationTest.java
	reformulation-core/src/test/java/org/semanticweb/ontop/reformulation/tests/UnificationTest2.java
Now compiling! But not yet working...
Rename DataType.java to Datatype.java
Bugfix. Removed attributes of SesameTupleQuery had reappeared during merge.
TurtleOBDAParser improperly merged.
Minor comment update.
RDBMSSIRepositoryManager merge: some lines were missing.
Bad type propagation int(count(v)) -> int(c).
Add check for error in SQLGenerator and remove check for equalties
Merge remote-tracking branch 'origin/feature/merge-develop-version2-041114' into feature/merge-develop-version2-041114
Remove unnecessary method getConditionsSharedVariablesAndConstants for shared variables in SQLGenerator
Fix conflict between the type propagation and normal modes about rejecting some substitutions.
Merge branch 'feature/merge-develop-version2-041114' of github.com:ontop/ontop into feature/merge-develop-version2-041114
NULL == NULL
Fix excessive type propagation such as URI(URI(x))
fix the classical mode switch in Quest
TypeLift now considers unions of substitution functions, not compositions. Algebra fixed.
TypePropagatingSubstitution extracted from Unifier.
Comments and TODO added to the TypePropagatingSubstitution. Expect major refactoring soon.
fix the datatype mappings of DATE/DATETIME/TIMESTAMP in SQLGenerator