tijiao 7
Merge branch 'master' of https://github.com/yangjun/eval

Conflicts:
	client/app/controllers/quotaIntergrityControllerr.js