main.js图标问题
recFriends
aa
Merge branch 'master' of https://github.com/handsomeTom/mblog

Conflicts:
	WebRoot/search_userlist.jsp
aa