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