fix preeplane_framework .project
fix merge problems
remove freeplane/lib/jortho.jar from git
fix wrong merge: add jna.jars to class path
Merge remote-tracking branch 'freeplane/docear/trunk'
remove jortho.jar
Conflicts:
	freeplane/lib/jortho.jar