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