添加世界频道
世界频道
simple
Merge branch 'master' into WorldChannel

Conflicts:
	AndroidManifest.xml
	src/com/chatgame/activity/finder/FinderActivity.java
	src/com/chatgame/constants/Constants.java
	src/com/chatgame/data/service/HttpService.java
世界频道需求
simple
世界频道
Merge branch 'WorldChannel'

Conflicts:
	src/com/chatgame/activity/message/MessageListActivity.java
Merge branch 'master' of git@github.com:momoplan/Game2.git

Conflicts:
	AndroidManifest.xml
	src/com/chatgame/activity/finder/FinderActivity.java
	src/com/chatgame/constants/Constants.java
	src/com/chatgame/data/service/HttpService.java
simple