Added GUI Configs
Fixed Crash
noop changes
Merge remote-tracking branch 'xander112/master' into dev_1.7.10

Conflicts:
	.project
	.settings/org.eclipse.jdt.core.prefs