add viewflow and basic change main activity
change for main page radio buttons
change z order for view flow
remove useless image
change Shopping from radiogroup to linearlayout
commit for takeout menu fragment
add takeoutorderconfimactivity
remove menu from project
add actionback bar for myfind
change for orderlist activity
change layout for change password
add activity_news back button
add assist second category adapter to set select status.
Merge branch 'master' of https://github.com/runyetech/find-android

Conflicts:
	res/layout/activity_shopping.xml
	res/values/dimens.xml
	res/values/strings.xml
	src/com/runyetech/find2/shopping/ShopListActivity.java
Merge branch 'master' of https://github.com/runyetech/find-android

Conflicts:
	AndroidManifest.xml
	res/layout/activity_address_edit.xml
	res/layout/service_book_hotel_order_confirm.xml
	res/layout/service_book_hotel_order_fill.xml
	res/layout/service_book_order_success.xml
	res/layout/service_book_search_list_item.xml
	res/layout/view_hotel_order_choose_house.xml
	res/values/strings.xml
	src/com/runyetech/find2/CallPhoneDialog.java
	src/com/runyetech/find2/ChooseSingleItemDialog.java
	src/com/runyetech/find2/myfind/MyFindActivity.java
	src/com/runyetech/find2/servicebook/OrderSuccessActivity.java
	src/com/runyetech/find2/servicebook/hotel/HotelActivity.java
	src/com/runyetech/find2/servicebook/hotel/HotelDetailActivity.java
	src/com/runyetech/find2/servicebook/hotel/HotelOrderConfirmActivity.java
	src/com/runyetech/find2/servicebook/hotel/HotelOrderFillActivity.java
	src/com/runyetech/find2/servicebook/hotel/HotelSearchResultActivity.java
	src/com/runyetech/find2/servicebook/ktv/KTVDetailActivity.java
	src/com/runyetech/find2/servicebook/restaurant/RestaurantDetailActivity.java
	src/com/runyetech/find2/shopping/ShopSummaryActivity.java