显示刚刚发送的+评论scrollview
Merge branch 'master' of https://github.com/mushanshitiancai/Yuan-Is-No-Say

Conflicts:
	AndroidManifest.xml