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