settings
Merge origin/master
new header menu ip
acclist decked out with new header, new blue [14,118,188]

Merge origin/master

Conflicts:
	Project/PresentationLayer/Settings.form
	Project/PresentationLayer/Settings.java
acclist decked out with new header, new blue [14,118,188]

Merge origin/master

Conflicts:
	Project/PresentationLayer/Settings.form
	Project/PresentationLayer/Settings.java