修改好友推送相关
添加 设置相关activity
Merge branch 'master' of ssh://git@github.com/zhuzhiqing/busy.git