finalize comment
fix minor bugs and clean up photoshare code before refractor login
structure
restructure Login Helper logic
init weibo check in and before make it singleton
finalize login helper
weibo changes
finalize upload photo layout ui
first init nearby cafe
upload photo working
fix couple of upload issues and camera orientation
fix upload issues
upload photo and cache image thumbail
implement front ad animationa and fix 2.3 layout issues
finish implementing share fb and weibo
finalize share fb weibo issue.........ready to clean up
pre add location listerner in map
pre fixing optimizing priority queue
fix final issues....waiting macau logo
Merge branch 'master' into baidumap

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/MacauFood.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/com/actionbarsherlock/R$color.class
	bin/classes/com/actionbarsherlock/R$dimen.class
	bin/classes/com/actionbarsherlock/R$id.class
	bin/classes/com/actionbarsherlock/R$integer.class
	bin/classes/com/actionbarsherlock/R$string.class
	bin/classes/com/actionbarsherlock/R$style.class
	bin/classes/com/cycon/macaufood/R$attr.class
	bin/classes/com/cycon/macaufood/R$bool.class
	bin/classes/com/cycon/macaufood/R$color.class
	bin/classes/com/cycon/macaufood/R$dimen.class
	bin/classes/com/cycon/macaufood/R$drawable.class
	bin/classes/com/cycon/macaufood/R$id.class
	bin/classes/com/cycon/macaufood/R$integer.class
	bin/classes/com/cycon/macaufood/R$layout.class
	bin/classes/com/cycon/macaufood/R$menu.class
	bin/classes/com/cycon/macaufood/R$raw.class
	bin/classes/com/cycon/macaufood/R$string.class
	bin/classes/com/cycon/macaufood/R$style.class
	bin/classes/com/cycon/macaufood/R$styleable.class
	bin/classes/com/cycon/macaufood/activities/About.class
	bin/classes/com/cycon/macaufood/activities/BaseActivity.class
	bin/classes/com/cycon/macaufood/activities/Branch.class
	bin/classes/com/cycon/macaufood/activities/Coupon.class
	bin/classes/com/cycon/macaufood/activities/Details$PaymentAdapter.class
	bin/classes/com/cycon/macaufood/activities/Details.class
	bin/classes/com/cycon/macaufood/activities/Disclaimer.class
	bin/classes/com/cycon/macaufood/activities/Favorite$FavoriteAdapter.class
	bin/classes/com/cycon/macaufood/activities/Favorite.class
	bin/classes/com/cycon/macaufood/activities/FoodNews.class
	bin/classes/com/cycon/macaufood/activities/FoodNewsImage.class
	bin/classes/com/cycon/macaufood/activities/FrontPage.class
	bin/classes/com/cycon/macaufood/activities/Home$2.class
	bin/classes/com/cycon/macaufood/activities/Home$3.class
	bin/classes/com/cycon/macaufood/activities/Home$4.class
	bin/classes/com/cycon/macaufood/activities/Home$5.class
	bin/classes/com/cycon/macaufood/activities/Home$TabsAdapter$TabInfo.class
	bin/classes/com/cycon/macaufood/activities/Home$TabsAdapter.class
	bin/classes/com/cycon/macaufood/activities/Home.class
	bin/classes/com/cycon/macaufood/activities/Info$FetchImageTask.class
	bin/classes/com/cycon/macaufood/activities/Info$FetchTextTask.class
	bin/classes/com/cycon/macaufood/activities/Info.class
	bin/classes/com/cycon/macaufood/activities/Intro$FetchImageTask.class
	bin/classes/com/cycon/macaufood/activities/Intro$FetchTextTask.class
	bin/classes/com/cycon/macaufood/activities/Intro.class
	bin/classes/com/cycon/macaufood/activities/MacauWifi$SectionArrayAdapter.class
	bin/classes/com/cycon/macaufood/activities/MacauWifi.class
	bin/classes/com/cycon/macaufood/activities/Map$1.class
	bin/classes/com/cycon/macaufood/activities/Map$10.class
	bin/classes/com/cycon/macaufood/activities/Map$11.class
	bin/classes/com/cycon/macaufood/activities/Map$12.class
	bin/classes/com/cycon/macaufood/activities/Map$2.class
	bin/classes/com/cycon/macaufood/activities/Map$3.class
	bin/classes/com/cycon/macaufood/activities/Map$4.class
	bin/classes/com/cycon/macaufood/activities/Map$5.class
	bin/classes/com/cycon/macaufood/activities/Map$6.class
	bin/classes/com/cycon/macaufood/activities/Map$7.class
	bin/classes/com/cycon/macaufood/activities/Map$8.class
	bin/classes/com/cycon/macaufood/activities/Map$9.class
	bin/classes/com/cycon/macaufood/activities/Map.class
	bin/classes/com/cycon/macaufood/activities/Menu.class
	bin/classes/com/cycon/macaufood/activities/PSDetails.class
	bin/classes/com/cycon/macaufood/activities/PhotoShare$10.class
	bin/classes/com/cycon/macaufood/activities/PhotoShare$RegisterPS.class
	bin/classes/com/cycon/macaufood/activities/PhotoShare.class
	bin/classes/com/cycon/macaufood/activities/Recommend.class
	bin/classes/com/cycon/macaufood/activities/Search$HistoryAdapter.class
	bin/classes/com/cycon/macaufood/activities/Search$SearchAdapter.class
	bin/classes/com/cycon/macaufood/activities/Search.class
	bin/classes/com/cycon/macaufood/activities/SplashScreen.class
	bin/classes/com/cycon/macaufood/adapters/CafeListAdapter.class
	bin/classes/com/cycon/macaufood/adapters/CafeSearchListAdapter.class
	bin/classes/com/cycon/macaufood/adapters/FoodNewsListAdapter.class
	bin/classes/com/cycon/macaufood/adapters/PSHotAdapter.class
	bin/classes/com/cycon/macaufood/sqlite/LocalDbManager.class
	bin/classes/com/cycon/macaufood/utilities/FeedBackDialogHelper$SubmitFeedBackTask.class
	bin/classes/com/cycon/macaufood/utilities/FeedBackDialogHelper.class
	bin/classes/com/cycon/macaufood/utilities/ImageLoader.class
	bin/classes/com/cycon/macaufood/utilities/MFFetchListHelper.class
	bin/classes/com/cycon/macaufood/utilities/MFUtil.class
	bin/classes/com/cycon/macaufood/widget/AdvViewPager.class
	bin/classes/com/cycon/macaufood/widget/BannerView.class
	bin/classes/com/cycon/macaufood/widget/DDListView.class
	bin/classes/com/cycon/macaufood/widget/FindFriendsDialogView$2.class
	bin/classes/com/cycon/macaufood/widget/FindFriendsDialogView$FriendListAdapter$1$1.class
	bin/classes/com/cycon/macaufood/widget/FindFriendsDialogView$FriendListAdapter.class
	bin/classes/com/cycon/macaufood/widget/FindFriendsDialogView.class
	bin/classes/com/cycon/macaufood/widget/GalleryNavigator.class
	bin/classes/com/cycon/macaufood/widget/LikeListDialogView$FriendListAdapter.class
	bin/classes/com/cycon/macaufood/widget/LikeListDialogView.class
	bin/classes/com/cycon/macaufood/widget/PSDetailsView$2.class
	bin/classes/com/cycon/macaufood/widget/PSDetailsView$3.class
	bin/classes/com/cycon/macaufood/widget/PSDetailsView.class
	bin/classes/com/cycon/macaufood/widget/PSHeaderView.class
	bin/classes/com/cycon/macaufood/widget/TouchImageView$TouchImageViewHelper.class
	bin/classes/com/facebook/android/R$color.class
	bin/classes/com/facebook/android/R$dimen.class
	bin/classes/com/facebook/android/R$drawable.class
	bin/classes/com/facebook/android/R$id.class
	bin/classes/com/facebook/android/R$string.class
	bin/classes/com/facebook/android/R$style.class
	bin/classes/com/google/android/gms/R$color.class
	bin/classes/com/google/android/gms/R$drawable.class
	bin/classes/com/google/android/gms/R$id.class
	bin/classes/com/google/android/gms/R$integer.class
	bin/classes/com/google/android/gms/R$string.class
	bin/classes/kankan/wheel/widget/WheelView.class
	bin/dexedLibs/actionbarsherlock-8702d46b915cba1db94747d65cbf0423.jar
	bin/dexedLibs/android-support-v4-7f38ab6e89e4bdbeefb31ee535bd9d4e.jar
	bin/dexedLibs/android-support-v7-appcompat-414295dd6b8e752b63edfa3e9123cfae.jar
	bin/dexedLibs/facebooksdk-a2551dc556e463104e754b343f85cf72.jar
	bin/dexedLibs/google-play-services-b4d7cb680d9a3e0ebb1106ad208389aa.jar
	bin/dexedLibs/google-play-services_lib-e3c16fb95c50189b605eb2c1de11d8d7.jar
	bin/dexedLibs/listview-animation-lib-374bc0b13f6cc7cb5fb7e89ad67677ba.jar
	bin/dexedLibs/nineoldandroids-2.4.0-60872371337ca35352fdaf77dc158918.jar
	bin/dexedLibs/sticky-listview-lib-8718f9d3a7450d9789d5e28027b1c369.jar
	bin/jarlist.cache
	bin/res/crunch/drawable-hdpi/macaufood_logo.png
	bin/resources.ap_
	gen/com/actionbarsherlock/R.java
	gen/com/cycon/macaufood/R.java
	gen/com/facebook/android/R.java
	gen/com/google/android/gms/R.java
	project.properties
	res/drawable-hdpi/macaufood_logo.png
	src/com/cycon/macaufood/activities/Home.java
	src/com/cycon/macaufood/activities/Map.java
	src/com/cycon/macaufood/activities/SplashScreen.java