* finish task #1601.
 * finish task #1595.
Merge branch 'master' of git@github.com:easysoft/zentaopms