Update notification model & views
Merge branch 'master' of https://github.com/jobinrefer/dev