增加更新功能

Signed-off-by: dabendan24 <1allen@163.com>
Merge branch 'master' of https://github.com/handsomeTom/dream

Conflicts:
	frontend/dream/bin/classes.dex
	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$1.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.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$raw.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/ScanActivity.class
	frontend/dream/bin/classes/com/example/dream/UserCardActivity.class
	frontend/dream/bin/classes/com/example/listener/BmStatusListener.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/StatusAdapter.class
	frontend/dream/bin/classes/com/handmark/pulltorefresh/library/internal/LoadingLayout.class
	frontend/dream/bin/dream.apk
	frontend/dream/bin/resources.ap_
	frontend/dream/gen/com/example/dream/R.java