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

Conflicts:

	src/less/basic/variables.less
	src/less/zui.less