add zentask style
Merge branch 'master' of https://github.com/hlta/ecms

Conflicts:
	.gitignore
add