added posibility to edit tasks
merge