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