acclist toolbox bug fixed, settings
Merge origin/master

Conflicts:
	Project/PresentationLayer/Settings.java