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