类别页修改
Merge branch 'master' of github.com:guzeng/one

Conflicts:
	app/views/home/header.php