关注功能实现
Merge remote-tracking branch 'origin/master'

Conflicts:
	models/user.js