修正错误
Merge branch 'dev' of https://github.com/avocadocn/mean into dev

Conflicts:
	app/views/partials/campaign_list.jade