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