sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/ToMoreTest.apk
2222
Merge branch 'master' of https://github.com/holmesli/eromot

Conflicts:
	bin/classes/com/app/tomore/DialogActivity.class
	bin/classes/com/app/tomore/MainActivity.class
	bin/classes/com/app/tomore/MainBLActivity$GetData.class
	bin/classes/com/app/tomore/MainBLActivity.class
	bin/classes/com/app/tomore/MainDuoliaoActivity.class
	bin/classes/com/app/tomore/MainMagActivity.class
	bin/classes/com/app/tomore/MainMemActivity$MyBaseAdapter.class
	bin/classes/com/app/tomore/MainMemActivity.class
	bin/classes/com/app/tomore/MyCameraActivity.class
	bin/classes/com/app/tomore/ViewAlbums.class
	bin/classes/com/app/tomore/ViewCache.class
	bin/classes/com/app/tomore/adapters/ArticleAdapter.class
	bin/classes/com/app/tomore/adapters/ImageAndTextListAdapter.class
	bin/classes/com/app/tomore/beans/MagViewCache.class
	bin/classes/com/app/tomore/fragment/BackToMainActivity.class
	bin/classes/com/app/tomore/fragment/SlidingView.class
	bin/classes/com/app/tomore/fragment/fragment_aboutus.class
	bin/classes/com/app/tomore/fragment/fragment_backtomain.class
	bin/classes/com/app/tomore/fragment/fragment_blacklist.class
	bin/classes/com/app/tomore/fragment/fragment_fensi.class
	bin/classes/com/app/tomore/fragment/fragment_guanzhu.class
	bin/classes/com/app/tomore/fragment/fragment_logout.class
	bin/classes/com/app/tomore/fragment/fragment_tiezi.class
	bin/classes/com/app/tomore/httpclient/AbstractHttpClient.class

	bin/classes/com/nostra13/universalimageloader/core/DisplayImageOptions.class
	bin/classes/com/nostra13/universalimageloader/core/ImageDecoder.class
	bin/classes/com/nostra13/universalimageloader/core/ImageLoader.class

	bin/classes/com/nostra13/universalimageloader/core/LoadAndDisplayImageTask.class