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