* code for task#1598.
 * code for task#1613.
Merge branch 'master' of github.com:easysoft/zentaopms