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