fix javaapp
aerge branch 'ran2' into develop

Conflicts:
	JavaApplication1/src/javaapplication1/JavaApplication1.java