friendlist改为从服务器读数据
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/app/baseActivity/NotifyReceiver.java
friendlist改为从服务器读数据