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