合并主线 代码
Merge branch 'master' into develop
添加微博 SDK 修复友盟BUG
合并分支代码
Merge branch 'develop'

Conflicts:
	AndroidManifest.xml
	project.properties
	src/com/chatgame/adapter/MyPingLunListAdapter.java