把主页中间部分分离出去
修改主页
Merge branch 'master' of https://github.com/aixiaoxianggithub/bigdo.git

Conflicts:
	res/layout/main_activity.xml
	res/layout/main_home.xml