添加 离线评论和赞 功能
Merge branch 'master' of git@github.com:momoplan/Game2.git

Conflicts:
	AndroidManifest.xml
	src/com/chatgame/activity/finder/FriendCircleActivity.java