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

Conflicts:
	gen/cn/trinea/android/common/R.java
	gen/com/fuwu/mobileim/R.java
	project.properties
	src/com/fuwu/mobileim/activity/TalkActivity.java