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