branch 3 coming from local
Signed-off-by: Michael Spielvogel <michael.spielvogel@gmx.at>
Merge remote-tracking branch 'origin/v6' into v7

Conflicts:
	myProject/bin/myProject/MyApp3.class
	myProject/src/myProject/MyApp3.java