Merge branch 'gui' into bookmarks

Conflicts:
	trunk/src/base/base.pro

diff --cc trunk/src/base/base.pro
index 3fe70ac,2faa1eb..ab9b7a0
--- 1/trunk/src/base/base.pro
--- 2/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@@ -33,7 -33,7 +33,8 @@@ SOURCES += gui/main.cpp
      gui/DictTypeSelectDialog.cpp \
      backbone/History.cpp \
      gui/HistoryListDialog.cpp \
-     backbone/Bookmarks.cpp
++    backbone/Bookmarks.cpp \
+     gui/WordListItem.cpp
  
  HEADERS  += gui/MainWindow.h \
      gui/SearchBarWidget.h \
@@@ -51,7 -51,7 +52,8 @@@
      ../includes/History.h \
      gui/HistoryListDialog.h \
      ../includes/GUIInterface.h \
-     backbone/Bookmarks.h
++    backbone/Bookmarks.h \
+     gui/WordListItem.h
  
  FORMS    += gui/MainWindow.ui