removed unneeded settings from preferences.xml
inserted check for notification settings
removed settings
Merge branch 'b1203_mji_2'