增加员工参加/退出活动前端接口
Merge branch 'dev' of https://github.com/avocadocn/mean into dev

Conflicts:
	public/js/controllers/user.js