xxxc
xx
Merge branch 'master' of https://github.com/handsomeTom/dream

Conflicts:
	frontend/dream/bin/classes/com/example/dream/ClassifyActivity.class
	frontend/dream/bin/classes/com/example/dream/DetailActivity$1.class
	frontend/dream/bin/classes/com/example/dream/DetailActivity$2.class
	frontend/dream/bin/classes/com/example/dream/DetailActivity$3.class
	frontend/dream/bin/classes/com/example/dream/DetailActivity.class
	frontend/dream/bin/classes/com/example/dream/LogActivity.class
	frontend/dream/bin/classes/com/example/dream/MainActivity$1.class
	frontend/dream/bin/classes/com/example/dream/MainActivity$2.class
	frontend/dream/bin/classes/com/example/dream/MainActivity$3.class
	frontend/dream/bin/classes/com/example/dream/MainActivity.class
	frontend/dream/bin/classes/com/example/dream/MessageActivity$1.class
	frontend/dream/bin/classes/com/example/dream/MessageActivity$2.class
	frontend/dream/bin/classes/com/example/dream/MessageActivity$3.class
	frontend/dream/bin/classes/com/example/dream/MessageActivity$MyViewBinder.class
	frontend/dream/bin/classes/com/example/dream/MessageActivity.class
	frontend/dream/bin/classes/com/example/dream/MyViewBinder.class
	frontend/dream/bin/classes/com/example/dream/PublishActivity.class
	frontend/dream/bin/classes/com/example/dream/R$drawable.class
	frontend/dream/bin/classes/com/example/dream/R$id.class
	frontend/dream/bin/classes/com/example/dream/R$layout.class
	frontend/dream/bin/classes/com/example/dream/R$menu.class
	frontend/dream/bin/classes/com/example/dream/R$string.class
	frontend/dream/bin/classes/com/example/dream/R$style.class
	frontend/dream/bin/classes/com/example/dream/R$styleable.class
	frontend/dream/bin/classes/com/example/dream/RegActivity.class
	frontend/dream/bin/classes/com/example/dream/UserCardActivity.class
	frontend/dream/bin/classes/com/example/dream/WelcomeActivity$1.class
	frontend/dream/bin/classes/com/example/dream/WelcomeActivity.class
	frontend/dream/bin/classes/com/example/listener/DetailListener.class
	frontend/dream/bin/classes/com/example/listener/LocationListener.class
	frontend/dream/bin/classes/com/example/listener/LogListener.class
	frontend/dream/bin/classes/com/example/listener/MainListener.class
	frontend/dream/bin/classes/com/example/listener/MessageListener.class
	frontend/dream/bin/classes/com/example/listener/PublishListener.class
	frontend/dream/bin/classes/com/example/listener/RegListener.class
	frontend/dream/bin/classes/com/example/listener/UserCardListener.class
	frontend/dream/bin/classes/com/example/util/DBFunction$1.class
	frontend/dream/bin/classes/com/example/util/DBFunction$2.class
	frontend/dream/bin/classes/com/example/util/DBFunction$3.class
	frontend/dream/bin/classes/com/example/util/DBFunction$4.class
	frontend/dream/bin/classes/com/example/util/DBFunction.class
	frontend/dream/bin/classes/com/example/util/Declare.class
	frontend/dream/bin/classes/com/example/util/JSONFunction.class
	frontend/dream/bin/classes/com/example/util/MyAdapter.class
	frontend/dream/bin/classes/com/example/util/MyAlertBuilder.class
	frontend/dream/bin/classes/com/example/util/MyClient.class
	frontend/dream/bin/classes/com/example/util/PollingService$PollingThread.class
	frontend/dream/bin/classes/com/example/util/PollingService.class
	frontend/dream/bin/classes/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout.class
	frontend/dream/bin/classes/com/handmark/pulltorefresh/library/internal/IndicatorLayout.class
	frontend/dream/bin/classes/com/handmark/pulltorefresh/library/internal/LoadingLayout.class
	frontend/dream/bin/classes/com/handmark/pulltorefresh/library/internal/RotateLoadingLayout.class
Merge branch 'master' of https://github.com/handsomeTom/dream

Conflicts:
	frontend/dream/bin/classes/com/example/bean/EventMessage.class
	frontend/dream/bin/classes/com/example/dream/BaomingActivity.class
	frontend/dream/bin/classes/com/example/dream/BmAdChooseActivity.class
	frontend/dream/bin/classes/com/example/dream/BmAdDetailActivity.class
	frontend/dream/bin/classes/com/example/dream/BmPublishActivity.class
	frontend/dream/bin/classes/com/example/dream/BmStatusActivity.class
	frontend/dream/bin/classes/com/example/dream/ClassifyActivity.class
	frontend/dream/bin/classes/com/example/dream/DetailActivity.class
	frontend/dream/bin/classes/com/example/dream/LogActivity.class
	frontend/dream/bin/classes/com/example/dream/MainActivity.class
	frontend/dream/bin/classes/com/example/dream/MessageActivity.class
	frontend/dream/bin/classes/com/example/dream/PublishActivity.class
	frontend/dream/bin/classes/com/example/dream/R$id.class
	frontend/dream/bin/classes/com/example/dream/R$layout.class
	frontend/dream/bin/classes/com/example/dream/R$menu.class
	frontend/dream/bin/classes/com/example/dream/R$string.class
	frontend/dream/bin/classes/com/example/dream/R$style.class
	frontend/dream/bin/classes/com/example/dream/R$styleable.class
	frontend/dream/bin/classes/com/example/dream/RegActivity.class
	frontend/dream/bin/classes/com/example/dream/UserCardActivity.class
	frontend/dream/bin/classes/com/example/dream/WelcomeActivity$1.class
	frontend/dream/bin/classes/com/example/dream/WelcomeActivity.class
	frontend/dream/bin/classes/com/example/listener/BaomingListener.class
	frontend/dream/bin/classes/com/example/listener/BmPublishListener.class
	frontend/dream/bin/classes/com/example/listener/DetailListener.class
	frontend/dream/bin/classes/com/example/listener/LocationListener.class
	frontend/dream/bin/classes/com/example/listener/LogListener.class
	frontend/dream/bin/classes/com/example/listener/MessageListener.class
	frontend/dream/bin/classes/com/example/listener/PublishListener.class
	frontend/dream/bin/classes/com/example/listener/RegListener.class
	frontend/dream/bin/classes/com/example/listener/UserCardListener.class
	frontend/dream/bin/classes/com/example/util/DBFunction.class
	frontend/dream/bin/classes/com/example/util/MyAdapter.class
	frontend/dream/bin/classes/com/example/util/MyViewBinder.class
	frontend/dream/bin/classes/com/example/util/PollingService$PollingThread.class
	frontend/dream/bin/classes/com/example/util/statusAdapter.class
	frontend/dream/bin/classes/com/handmark/pulltorefresh/library/internal/LoadingLayout.class