Merge branch 'master' into contact_dialog
[situare] / res / icon /
drwxr-xr-x   ..
drwxr-xr-x - 48x48
drwxr-xr-x - 64x64