revise
Merge branch 'master' of https://github.com/klisly/ontology.git

Conflicts:
	QAOntologyLibrary/src/ontobuild/com/vcg/semantic/parser/Decoder.java
reparseData