Conflicts:
	Sankore_3.1.pro
	src/board/UBBoardPaletteManager.cpp
	src/board/UBBoardView.cpp
	src/document/UBDocumentProxy.cpp
	src/gui/UBDockPaletteWidget.cpp
	src/gui/UBTeacherBarWidget.h
	src/web/UBWebController.h