improved color settings. Cancel will reset to previous settings
Merge branch 'master' of https://github.com/middleofdreams/workload

Conflicts:
	lib/settingsWindow.py