fixed some merge issues

Sankore_3.1.pro

@@ -55,6 +55,7 @@ include(src/desktop/desktop.pri)
 include(src/web/web.pri)
 include(src/transition/transition.pri)
 include(src/interfaces/interfaces.pri)
+include(src/customWidgets/customWidgets.pri)
 
 DEPENDPATH += src/pdf-merger
 INCLUDEPATH += src/pdf-merger

resources/forms/preferences.ui

@@ -1374,7 +1374,7 @@ p, li { white-space: pre-wrap; }
       <attribute name="title">
        <string>Credits</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
+      <layout class="QVBoxLayout" name="verticalLayout_31">
        <item>
         <widget class="QTextBrowser" name="credentialTextBrowser">
          <property name="html">

src/adaptors/UBExportCFF.h

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef UBExportCFF_H_
+#define UBExportCFF_H_
+
+#include <QtCore>
+
+#include "UBExportAdaptor.h"
+
+#include "frameworks/UBFileSystemUtils.h"
+
+class UBDocumentProxy;
+
+class UBExportCFF : public UBExportAdaptor
+{
+    Q_OBJECT;
+
+public:
+    UBExportCFF(QObject *parent = 0);
+    virtual ~UBExportCFF();
+
+    virtual QString exportName();
+    virtual QString exportExtention();
+    virtual void persist(UBDocumentProxy* pDocument);
+};
+
+#endif /* UBExportCFF_H_ */
\ No newline at end of file

src/gui/UBTeacherGuideWidgetsTools.cpp

@@ -36,6 +36,8 @@
 
 #include "frameworks/UBFileSystemUtils.h"
 
+#include "customWidgets/UBMediaWidget.h"
+
 #include "core/memcheck.h"
 
 

src/gui/UBTeacherGuideWidgetsTools.h

@@ -39,6 +39,7 @@ class QTextEdit;
 class QWidget;
 class UBTGAdaptableText;
 class QDomElement;
+class UBMediaWidget;
 
 typedef struct
 {