Fix bad merge from previous commit. This prevents an error when loading a task edit view.
Fix bad merge from previous commit. This prevents an error when loading a task edit view.

arunagw/clockingit,evinoca/clockingit,digitalnatives/jobsworth,webstream-io/jobsworth,rafaspinola/jobsworth,webstream-io/jobsworth,arunagw/clockingit,rafaspinola/jobsworth,digitalnatives/jobsworth,xuewenfei/jobsworth,digitalnatives/jobsworth,xuewenfei/jobsworth,ari/jobsworth,rafaspinola/jobsworth,xuewenfei/jobsworth,ari/jobsworth,digitalnatives/jobsworth,evinoca/clockingit,webstream-io/jobsworth,rafaspinola/jobsworth,digitalnatives/jobsworth,webstream-io/jobsworth,arunagw/clockingit,ari/jobsworth,evinoca/clockingit,ari/jobsworth,xuewenfei/jobsworth,evinoca/clockingit