zxn
Merge branch 'master' of github.com:lifang/fuxin_android

Conflicts:
	AndroidManifest.xml
	src/com/fuwu/mobileim/activity/TalkActivity.java