Merge branch 'stacked_friends'
[situare] / res / languages /
drwxr-xr-x   ..
drwxr-xr-x - fi