Conflicts:
	resources/sankore.qrc
	src/board/UBBoardPaletteManager.cpp
	src/board/UBBoardPaletteManager.h
	src/gui/UBTeacherBarWidget.cpp