Merge origin/master into wwh

Conflicts:
	JavaApplication1/src/javaapplication1/JavaApplication1.java