修改约战细节
Merge branch 'dev' of https://github.com/avocadocn/mean into dev

Conflicts:
	public/views/campaign_list.html
完善约战系统
Merge branch 'dev' of https://github.com/avocadocn/mean into dev

Conflicts:
	app/controllers/group.js