Merge branch 'master' into test

Conflicts:
	src/templets/zhongyuan/head.htm