修改动态和活动的分布视图
Merge commit 'ec17905b3b727cd4e4a3569c5f3a04c6bbfcd310' into dev

Conflicts:
	app/views/partials/campaign_list.jade