* finish change task #2011
Merge branch 'master' of https://github.com/easysoft/zentaopms