Merge branch 'master' of https://github.com/Eric0808/39health

Conflicts:
	phpcms/modules/zsask/index.php
Merge branch 'lucongcong' of https://github.com/Eric0808/39health into lucongcong