Setting Panel
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/obicere/cc/shutdown/SaveLayoutHook.java
	src/org/obicere/cc/shutdown/ShutDownHook.java