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

Conflicts:
	app/views/user/userRow.xml
11
friendAddRequest
Merge branch 'master' of https://github.com/hoyoji/HoYoJi