added watched flag when sending notifications
cleaning up code
cleaned up code
Merge pull request #217 from reviewninja/feature/notification-watched

Feature/notification watched