Merge branch 'master' of github.com:zlz3907/z-xml

Conflicts:
	.gitignore