please merge
Merge branch 'master' of github.com:nguyenmp/CSILStatusAndroid
Partial implementation of friend notification feature