修改底色的样式删除
好友列表  样式部分修改
yy
Merge branch 'feature/yy_user' into develop

Conflicts:
	app/assets/javascripts/base.js.coffee