update
Merge branch 'develop' of https://github.com/herryli/lszx into develop

Conflicts:
	phpcms/templates/default/content/header.html