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