Merge branch 'master' into friendlist
[situare] / res / images / arrow_right.png
res/images/arrow_right.png