Conflicts: resources/sankore.qrc src/adaptors/UBSvgSubsetAdaptor.cpp src/adaptors/UBSvgSubsetAdaptor.h src/gui/UBDockPalette.cpp src/gui/UBDockPalette.h src/gui/UBLibPalette.cpp src/gui/UBNavigatorPalette.cpp