Added an editor for category to user task.  ACT-2067
Merge branch 'master' into gray_custom