setttings added

Created settings class to store settings and a dialog to change them
merged in master
cleanup
Merge remote-tracking branch 'origin/master' into d2