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

Conflicts:
	AndroidManifest.xml
	gen/com/fuwu/mobileim/R.java
	src/com/fuwu/mobileim/activity/ChatActivity.java
	src/com/fuwu/mobileim/activity/FragmengtActivity.java
	src/com/fuwu/mobileim/activity/LoginActivity.java
	src/com/fuwu/mobileim/activity/RequstService.java
	src/com/fuwu/mobileim/activity/ResetPasswordActicity.java
	src/com/fuwu/mobileim/activity/TalkActivity.java
	src/com/fuwu/mobileim/pojo/ContactPojo.java
	src/com/fuwu/mobileim/util/Urlinterface.java
Merge branch 'master' of github.com:lifang/fuxin_android

Conflicts:
	gen/com/fuwu/mobileim/R.java
	src/com/fuwu/mobileim/util/Urlinterface.java