* code for task#1830.
Merge branch 'master' of github.com:easysoft/zentaopms