修改
Merge branch 'master' of github.com:gokuai/cms-theme

Conflicts:
	template-tpl2.php