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