Some repairs after merge
Merge remote-tracking branch 'remotes/git/RELEASE-2.1' into RELEASE-2.1-JSP
refactored task view, working html widgets