* finish task#1755.
Merge branch 'master' of git@github.com:easysoft/zui