整理框架
Merge branch 'developVersion2.0' of https://github.com/ScutYuf/yuf.git
into developVersion2.0

Conflicts:
	res/layout/main_tab_2_v.xml
	res/layout/tab1_share.xml