first commit for notif settings
Merge pull request #135 from joanneci/19736

first commit for notif settings