调试
调试2
Merge branch 'master' of https://github.com/handsomeTom/dream

Conflicts:
	frontend/dream/bin/classes.dex
	frontend/dream/bin/classes/com/example/bean/BmUserInfo.class
	frontend/dream/bin/classes/com/example/dream/BaomingActivity.class
	frontend/dream/bin/classes/com/example/dream/BmStatusActivity$1.class
	frontend/dream/bin/classes/com/example/dream/BmStatusActivity.class
	frontend/dream/bin/classes/com/example/dream/MainActivity.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/LogListener.class
	frontend/dream/bin/classes/com/example/util/DBFunction.class
	frontend/dream/bin/classes/com/example/util/MyViewBinder.class
	frontend/dream/bin/classes/com/example/util/statusAdapter.class
	frontend/dream/bin/dream.apk
	frontend/dream/bin/resources.ap_