[WIP] Feature/adding and removing watchers

https://www.openproject.org/work_packages/13953
the ", " at the end needs to be removed