Merge branch 'backbone'

Conflicts:
	trunk/src/base/base.pro

diff --cc trunk/src/base/base.pro
index 48ff83e,d902b3c..a24b4ed
--- 1/trunk/src/base/base.pro
--- 2/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@@ -36,8 -36,7 +36,7 @@@ SOURCES += gui/main.cpp 
      gui/AboutWidget.cpp \
      gui/TranslationTextEdit.cpp
  
 -HEADERS  += gui/MainWindow.h \
 +HEADERS += gui/MainWindow.h \
- 
      gui/AboutWidget.h \
      gui/SearchBarWidget.h \
      gui/WordListWidget.h \