z
Merge branch 'master' of https://github.com/hoyoji/HoYoJi

Conflicts:
	app/controllers/message/friendAddResponseMsg.js
m