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

Conflicts:
	src/com/fuwu/mobileim/activity/ChatActivity.java
malong
Merge branch 'master' of github.com:lifang/fuxin_android

Conflicts:
	src/com/fuwu/mobileim/activity/TalkActivity.java
malong
malong
Merge branch 'master' of github.com:lifang/fuxin_android

Conflicts:
	project.properties