Updata favorite
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/user/getFavorite.js
Merge branch 'master' of https://github.com/yuanguozheng/XiyouLibNodeExpress