Merge branch 'dev' into friendlist
[situare] / res / images / dummy_Avatar.png
res/images/dummy_Avatar.png