为了拉代码
Merge branch 'master' of https://github.com/mushanshitiancai/Yuan-Is-No-Say

Conflicts:
	src/com/yuan/yuanisnosay/CommentActivity.java