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

Conflicts:
	app/views/friend/friendCategoryRow.xml
	plugins/ti.alloy/plugin.pyc