third commit
Merge branch 'origin/master'

Conflicts:
	OntologyModeler/application/src/test/java/modeler/ApplicationTest.java
Revert "Merge branch 'origin/master'"

This reverts commit abfdf0b50ac7a3426e12dc2c93998932aa191c00, reversing
changes made to 32cc402ab7e99e2cd1f979c84dadf82b9d6c3c88.
Merge branch 'Cong'
Merge branch 'origin/master'

Conflicts:
	OntologyModeler/application/src/test/java/modeler/ApplicationTest.java (reverted from commit abfdf0b50ac7a3426e12dc2c93998932aa191c00)
fucked up
Merge branch 'Cong', conflict resolved