1、修复首页文章图片无法显示问题
2、轮播、话题隐藏
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/views/layouts/site.php