Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit e3ff8c121a0819c150195b98b4e2af10bd99c18b.

Conflicts:
	JavaApplication1/build/classes/javaapplication1/NewJFrame$1.class
	JavaApplication1/build/classes/javaapplication1/NewJFrame$2.class
	JavaApplication1/build/classes/javaapplication1/NewJFrame$3.class
	JavaApplication1/build/classes/javaapplication1/NewJFrame$4.class
	JavaApplication1/build/classes/javaapplication1/NewJFrame$5.class
	JavaApplication1/build/classes/javaapplication1/NewJFrame$6.class
	JavaApplication1/build/classes/javaapplication1/NewJFrame$7.class
	JavaApplication1/build/classes/javaapplication1/NewJFrame$8.class
	JavaApplication1/build/classes/javaapplication1/NewJFrame$9.class
	JavaApplication1/build/classes/javaapplication1/NewJFrame.class
	JavaApplication1/build/classes/javaapplication1/NewJFrame.form
	JavaApplication1/src/javaapplication1/NewJFrame.form
	JavaApplication1/src/javaapplication1/NewJFrame.java