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