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