Conflicts:
	Sankore_3.1.pro
	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_sv.ts
	resources/i18n/sankore_zh.ts
	src/core/UBDisplayManager.cpp