NR-828 : Add/Edit Task

review
NR-873: Task plugin
* absorbed a merge