fixing update/edit and adding notifications support to deadlines
merge conflict