merge branch
included deactivate and update for workitems
Merge branch 'xurui'
edits in workitemscontroller