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