从NLPQuery转化成OntoQuery
Merge branch 'master' of https://github.com/klisly/ontology.git

Conflicts:
	QAOntologyLibrary/src/cn/vcg/qa/ontolog/OntologyContent.java
	QAOntologyLibrary/src/cn/vcg/qa/ontolog/SemanticInterpretationEngine.java
	QAOntologyLibrary/src/cn/vcg/qa/ontolog/entity/IndividualInfo.java
	QAOntologyLibrary/src/cn/vcg/qa/ontolog/entity/ObjectPropertyInfo.java