* finish task #1591 1590.
Merge branch 'master' of git@github.com:easysoft/zentaopms