* finish task #2039,2040.
Merge branch 'master' of github.com:easysoft/zentaopms