added settings forms
fix notification settings
Merge branch 'master' into settings
add logging for settings
Merge branch 'master' into settings