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