Merge branch 'master' of https://github.com/laichendong/talent into laichendong-master2

Conflicts:
	app/controllers/subject.js