Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/.gitignore
	build/classes/META-INF/persistence.xml
	build/classes/PanelsInGUI/GUI$1.class
	build/classes/PanelsInGUI/GUI$2.class
	build/classes/PanelsInGUI/GUI.class
	src/META-INF/persistence.xml
	src/PanelsInGUI/GUI.java