修改了detail activity的布局
修改了detail_activity的布局

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

Conflicts:
	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/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/listener/DetailListener.class
	frontend/dream/bin/classes/com/example/listener/LogListener.class
	frontend/dream/bin/classes/com/example/listener/PublishListener.class
	frontend/dream/bin/classes/com/example/listener/UserCardListener.class
	frontend/dream/bin/classes/com/handmark/pulltorefresh/library/internal/LoadingLayout.class
	frontend/dream/gen/com/example/dream/R.java
	frontend/dream/res/layout/event_detail.xml