page， 记录
Merge branch 'dev' into lab

Conflicts:
	cohost/templates/cohost/detail.html
	cohost/templates/cohost/home.html