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