Conflicts:
	.gitignore
	Sankore_3.1.pro
	buildDebianPackage
	lgpl.txt
	release.linux.sh
	release.macx.sh
	release.win7.vc9.bat
	resources/etc/SankoreEditor/editor_en/index.html
	resources/etc/SankoreEditor/editor_fr/index.html
	resources/forms/preferences.ui
	resources/i18n/sankore_ar.ts
	resources/i18n/sankore_da.ts
	resources/i18n/sankore_de.ts
	resources/i18n/sankore_en.ts
	resources/i18n/sankore_en_UK.ts
	resources/i18n/sankore_es.ts
	resources/i18n/sankore_fr.ts
	resources/i18n/sankore_fr_CH.ts
	resources/i18n/sankore_it.ts
	resources/i18n/sankore_iw.ts
	resources/i18n/sankore_ja.ts
	resources/i18n/sankore_ko.ts
	resources/i18n/sankore_nb.ts
	resources/i18n/sankore_nl.ts
	resources/i18n/sankore_pl.ts
	resources/i18n/sankore_pt.ts
	resources/i18n/sankore_rm.ts
	resources/i18n/sankore_ro.ts
	resources/i18n/sankore_ru.ts
	resources/i18n/sankore_sk.ts
	resources/i18n/sankore_sv.ts
	resources/i18n/sankore_zh.ts
	resources/library/applications/Cellule.wgt/js/textes_descriptifs.js
	src/adaptors/UBExportCFF.h
	src/adaptors/UBSvgSubsetAdaptor.cpp
	src/board/UBBoardController.cpp
	src/board/UBBoardView.cpp
	src/core/UBDisplayManager.cpp
	src/core/UBSettings.cpp
	src/customWidgets/UBActionableWidget.cpp
	src/customWidgets/UBActionableWidget.h
	src/customWidgets/UBMediaWidget.cpp
	src/customWidgets/UBMediaWidget.h
	src/customWidgets/customWidgets.pri
	src/domain/UBGraphicsAudioItem.cpp
	src/domain/UBGraphicsItemDelegate.cpp
	src/domain/UBGraphicsScene.cpp
	src/domain/UBGraphicsScene.h
	src/domain/UBGraphicsVideoItem.cpp
	src/domain/UBW3CWidget.cpp
	src/frameworks/UBPlatformUtils_mac.mm
	src/gui/UBDockPalette.cpp
	src/gui/UBNavigatorPalette.cpp
	src/interfaces/IDataStorage.h