Merge branch 'gui'
[mdictionary] / trunk /
drwxr-xr-x   ..
drwxr-xr-x - src
drwxr-xr-x - tests