daily commit.
Merge branch 'master' of https://github.com/hanxianlong/74cms32.shiyishi.tk

Conflicts:
	.gitignore
	admin/statement/userreg_30_days.xml
	data/cache_category.php