首页布局增加
Merge branch 'master' of https://github.com/tcmaster/HiSite

Conflicts:
	HiSite/res/layout/fragment_hi_live.xml