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