1、有点冲突
Merge branch 'master' of https://github.com/zhsheng26/FoYouHui

Conflicts:
	FoYouHui/res/drawable/tab_bottom_homepage.xml