Fixed task edit/update bug
Merge branch 'master' into alyssa