组件背景
Merge branch 'dev' of https://github.com/avocadocn/mean into dev

Conflicts:
	public/views/campaign_list.html