能显示评论了...
Merge branch 'master' of https://github.com/tiiime/AvosTest

Conflicts:
	AndroidManifest.xml
	res/layout/activity_reply.xml
	src/com/example/avostest/MainActivity.java
	src/com/example/avostest/ReplyActivity.java
	src/com/example/avostest/SendMessageActivity.java