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