first commit
Merge branch 'origin/Cong'

Conflicts:
	OntologyModeler/application/src/test/java/modeler/ApplicationTest.java