Merge remote-tracking branch 'origin/master'

Conflicts:
	buildConfig/config/guiConfig.json
	buildConfig/textures/gui/gui.fla
	buildConfig/textures/gui/gui.png
	buildConfig/textures/gui/gui.xml