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