Merge origin/master

Conflicts:
	src/javaapplication3/JavaApplication3.java