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