Merge remote-tracking branch 'origin/master' into gal

Conflicts:
	src/gui/GUIBackground.java
nbfcgfhcfhfbfbcfbc
Merge remote-tracking branch 'origin/gal'