添加朋友圈2.0 功能
Merge branch 'master' of git@github.com:momoplan/Game2.git

Conflicts:
	AndroidManifest.xml
	res/values/colors.xml
	src/com/chatgame/activity/finder/FinderActivity.java
	src/com/chatgame/activity/personalCenter/SelectFriendActivity.java
	src/com/chatgame/adapter/FriendStatusListAdapter.java
	src/com/chatgame/adapter/MyPingLunListAdapter.java
	src/com/chatgame/adapter/PublishAdapter.java
	src/com/chatgame/data/service/ImageService.java
	src/com/chatgame/utils/common/BitmapXUtil.java
	src/com/chatgame/utils/common/PhotoUtils.java