Merge branch 'master' into google
[mdictionary] / data /
drwxr-xr-x   ..
drwxr-xr-x - dicts
drwxr-xr-x - icons
drwxr-xr-x - other