Merge branch 'master' into userinfo
[situare] / res / images / friend_group.png
res/images/friend_group.png