* code for task#1424.
* code for task#1412.
Merge branch 'master' of git@github.com:easysoft/zentaopms