Merge branch 'master' into userinfo

[situare] / res / images / friend_group.png

diff --git a/res/images/friend_group.png b/res/images/friend_group.png
old mode 100644 (file)
new mode 100755 (executable)
index 9b8aec7..cbdcd1d
Binary files a/res/images/friend_group.png and b/res/images/friend_group.png differ