sad
sdas
dfd
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	.gitignore
	bin/classes/com/handmark/pulltorefresh/library/internal/LoadingLayout.class
	bin/classes/com/yuf/app/adapter/FoodMaterialGVAdapter.class
	bin/classes/com/yuf/app/mywidget/FoodViewPage.class
	bin/classes/com/yuf/app/ui/Main$1.class
	bin/classes/com/yuf/app/ui/Main$2.class
	bin/classes/com/yuf/app/ui/Main$3.class
	bin/classes/com/yuf/app/ui/Main$4.class
	bin/classes/com/yuf/app/ui/Main$5.class
	bin/classes/com/yuf/app/ui/Main$6.class
	bin/classes/com/yuf/app/ui/Main$7.class
	bin/classes/com/yuf/app/ui/Main$MyOnClickListener.class
	bin/classes/com/yuf/app/ui/Main$MyOnPageChangeListener.class
	bin/classes/com/yuf/app/ui/Main$MyPageChangeListener.class
	bin/classes/com/yuf/app/ui/Main.class
	bin/classes/com/yuf/app/ui/R$drawable.class
	bin/classes/com/yuf/app/ui/R$id.class
	bin/classes/com/yuf/app/ui/R$integer.class
	bin/classes/com/yuf/app/ui/R$layout.class
	bin/classes/com/yuf/app/ui/R$menu.class
	bin/classes/com/yuf/app/ui/R$string.class
	bin/classes/com/yuf/app/ui/R$style.class
	bin/classes/com/yuf/app/ui/R$styleable.class
	bin/classes/com/yuf/app/ui/Tab0FoodActivity.class
	bin/classes/com/yuf/app/ui/Tab0FoodCookFragment$1.class
	bin/classes/com/yuf/app/ui/Tab0FoodCookFragment$2.class
	bin/classes/com/yuf/app/ui/Tab0FoodCookFragment$3.class
	bin/classes/com/yuf/app/ui/Tab0FoodCookFragment$4.class
	bin/classes/com/yuf/app/ui/Tab0FoodCookFragment$5.class
	bin/classes/com/yuf/app/ui/Tab0FoodCookFragment$6.class
	bin/classes/com/yuf/app/ui/Tab0FoodCookFragment$7.class
	bin/classes/com/yuf/app/ui/Tab0FoodCookFragment$8.class
	bin/classes/com/yuf/app/ui/Tab0FoodCookFragment$9.class
	bin/classes/com/yuf/app/ui/Tab0FoodCookFragment.class
	bin/classes/com/yuf/app/ui/Tab0FoodMaterialFragment.class
	bin/classes/com/yuf/app/ui/Tab0MyRecipeFragment$1$1.class
	bin/classes/com/yuf/app/ui/Tab0MyRecipeFragment$1$2.class
	bin/classes/com/yuf/app/ui/Tab0MyRecipeFragment$1.class
	bin/classes/com/yuf/app/ui/Tab0MyRecipeFragment$2.class
	bin/classes/com/yuf/app/ui/Tab0MyRecipeFragment$3.class
	bin/classes/com/yuf/app/ui/Tab0MyRecipeFragment.class
	bin/classes/com/yuf/app/ui/Tab0SearchActivity.class
	bin/classes/com/yuf/app/ui/Tab1SocietyForceFragment.class
	bin/classes/com/yuf/app/ui/Tab1SocietyShareFragment.class
	bin/classes/com/yuf/app/ui/Tab2AddressActivity.class
	bin/classes/com/yuf/app/ui/Tab2BougthActivity.class
	bin/classes/com/yuf/app/ui/Tab2ReceiveTimeActivity.class
	bin/classes/com/yuf/app/ui/Tab2RemindActivity.class
	bin/classes/com/yuf/app/ui/Tab2WaitForPayActivity.class
	bin/classes/com/yuf/app/ui/Tab3AboutUsActivity.class
	bin/classes/com/yuf/app/ui/Tab3AddWorkActivity.class
	bin/classes/com/yuf/app/ui/Tab3DegreeActivity.class
	bin/classes/com/yuf/app/ui/Tab3MyCollectionActivity.class
	bin/classes/com/yuf/app/ui/Tab3MyWorkActivity$MyListAdapter.class
	bin/classes/com/yuf/app/ui/Tab3MyWorkActivity.class
	gen/com/yuf/app/ui/R.java
	res/anim/dialog_enter_anim.xml
	res/anim/dialog_exit_anim.xml
	res/anim/slide_in_from_bottom.xml
	res/anim/slide_in_from_top.xml
	res/anim/slide_out_to_bottom.xml
	res/anim/slide_out_to_top.xml
	res/drawable-hdpi/default_ptr_flip.png
	res/drawable-hdpi/default_ptr_rotate.png
	res/drawable-hdpi/indicator_arrow.png
	res/drawable/indicator_bg_bottom.xml
	res/drawable/indicator_bg_top.xml
	res/drawable/shape.xml
	res/drawable/shape2.xml
	res/drawable/shape3.xml
	res/layout/comment_popuwindow.xml
	res/layout/login_activity.xml
	res/layout/logon_activity.xml
	res/layout/main_tab_0.xml
	res/layout/main_tab_1.xml
	res/layout/main_tab_2.xml
	res/layout/main_tab_3.xml
	res/layout/material_detail_dialg.xml
	res/layout/pull_to_refresh_header_horizontal.xml
	res/layout/pull_to_refresh_header_vertical.xml
	res/layout/tab0_food_cook.xml
	res/layout/tab0_food_material.xml
	res/layout/tab0_recipe_fragment.xml
	res/layout/tab0_search.xml
	res/layout/tab1_myfocus.xml
	res/layout/tab1_myfocus_list_item.xml
	res/layout/tab1_share.xml
	res/layout/tab1_share_list_item.xml
	res/layout/tab2_bought.xml
	res/layout/tab2_bougth_item.xml
	res/layout/tab2_food_material_gridview_item.xml
	res/layout/tab2_wait_pay.xml
	res/layout/tab2_waitforpay_item.xml
	res/layout/tab3_about_our.xml
	res/layout/tab3_add_work.xml
	res/layout/tab3_degree.xml
	res/layout/tab3_mycollection.xml
	res/layout/tab3_mywork.xml
	res/layout/tab3_mywork_mycollection_item.xml
	res/values/dimens.xml
	res/values/ids.xml
	res/values/pull_refresh_strings.xml
	src/com/handmark/pulltorefresh/library/ILoadingLayout.java
	src/com/handmark/pulltorefresh/library/IPullToRefresh.java
	src/com/handmark/pulltorefresh/library/LoadingLayoutProxy.java
	src/com/handmark/pulltorefresh/library/OverscrollHelper.java
	src/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase.java
	src/com/handmark/pulltorefresh/library/PullToRefreshBase.java
	src/com/handmark/pulltorefresh/library/PullToRefreshExpandableListView.java
	src/com/handmark/pulltorefresh/library/PullToRefreshGridView.java
	src/com/handmark/pulltorefresh/library/PullToRefreshHorizontalScrollView.java
	src/com/handmark/pulltorefresh/library/PullToRefreshListView.java
	src/com/handmark/pulltorefresh/library/PullToRefreshScrollView.java
	src/com/handmark/pulltorefresh/library/PullToRefreshWebView.java
	src/com/handmark/pulltorefresh/library/extras/PullToRefreshWebView2.java
	src/com/handmark/pulltorefresh/library/extras/SoundPullEventListener.java
	src/com/handmark/pulltorefresh/library/internal/EmptyViewMethodAccessor.java
	src/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout.java
	src/com/handmark/pulltorefresh/library/internal/IndicatorLayout.java
	src/com/handmark/pulltorefresh/library/internal/LoadingLayout.java
	src/com/handmark/pulltorefresh/library/internal/RotateLoadingLayout.java
	src/com/handmark/pulltorefresh/library/internal/Utils.java
	src/com/handmark/pulltorefresh/library/internal/ViewCompat.java
	src/com/yuf/app/mywidget/FoodViewPage.java
	src/com/yuf/app/ui/Main.java
	src/com/yuf/app/ui/Tab0FoodCookFragment.java
	src/com/yuf/app/ui/Tab0MyRecipeFragment.java
	src/com/yuf/app/ui/Tab1SocietyForceFragment.java
	src/com/yuf/app/ui/Tab1SocietyShareFragment.java