fix
Merge branch 'master' of https://github.com/yuhang2/quku

Conflicts:
	quku/application/models/hot_model.php