diff --git a/src/CoreBundle/Component/Editor/CkEditor/CkEditor.php b/src/CoreBundle/Component/Editor/CkEditor/CkEditor.php
index 3533657435..7d07cca9af 100644
--- a/src/CoreBundle/Component/Editor/CkEditor/CkEditor.php
+++ b/src/CoreBundle/Component/Editor/CkEditor/CkEditor.php
@@ -62,7 +62,7 @@ class CkEditor extends Editor
             } else {
                 $cssFile = api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/editor.css';
             }
-            $style = '<link href="'.$cssFile.'" rel="stylesheet" media="screen" type="text/css" />';
+            $style = '<link href="'.$cssFile.'" rel="stylesheet" type="text/css" />';
         }
 
         $html = '<textarea id="'.$this->getName().'" name="'.$this->getName().'" class="ckeditor">
diff --git a/src/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php b/src/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
index 7daccfb1c9..1d0a03a37b 100644
--- a/src/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
+++ b/src/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
@@ -146,7 +146,7 @@ class Basic extends Toolbar
             $config['toolbar_maxToolbar'] = $this->getMaximizedToolbar();
         }
 
-        $config['customConfig'] = api_get_path(WEB_LIBRARY_JS_PATH).'ckeditor/config_js.php';
+        $config['customConfig'] = api_get_path(WEB_LIBRARY_JS_PATH).'ckeditor/config_js.php?'.api_get_cidreq();
         $config['flash_flvPlayer'] = api_get_path(WEB_LIBRARY_JS_PATH).'ckeditor/plugins/flash/swf/player.swf';
 
         /*filebrowserFlashBrowseUrl
diff --git a/src/CoreBundle/Entity/AccessUrl.php b/src/CoreBundle/Entity/AccessUrl.php
index 5a15d015ed..19e2577c66 100644
--- a/src/CoreBundle/Entity/AccessUrl.php
+++ b/src/CoreBundle/Entity/AccessUrl.php
@@ -126,7 +126,7 @@ class AccessUrl
     /**
      * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\SettingsCurrent", mappedBy="url", cascade={"persist"}, orphanRemoval=true)
      **/
-    //protected $settings;
+    protected $settings;
 
     /**
      * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\SessionCategory", mappedBy="url", cascade={"persist"}, orphanRemoval=true)
diff --git a/src/CoreBundle/Entity/Repository/CourseCategoryRepository.php b/src/CoreBundle/Entity/Repository/CourseCategoryRepository.php
index 9533e25d41..1a14010b23 100644
--- a/src/CoreBundle/Entity/Repository/CourseCategoryRepository.php
+++ b/src/CoreBundle/Entity/Repository/CourseCategoryRepository.php
@@ -15,35 +15,43 @@ class CourseCategoryRepository extends EntityRepository
     /**
      * Get all course categories in an access url
      * @param int $accessUrl
+     * @param bool $allowBaseCategories
+     *
      * @return array
      */
-    public function findAllInAccessUrl($accessUrl)
+    public function findAllInAccessUrl($accessUrl, $allowBaseCategories = false)
     {
         $qb = $this->createQueryBuilder('c');
-        $query = $qb
+        $qb
             ->innerJoin(
                 'ChamiloCoreBundle:AccessUrlRelCourseCategory',
                 'a',
                 Join::WITH,
                 'c = a.courseCategoryId'
             )
-            ->where(
-                $qb->expr()->eq('a.accessUrlId', $accessUrl)
-            )->orderBy('c.treePos', 'ASC')
-            ->getQuery();
+            ->where($qb->expr()->eq('a.accessUrlId', $accessUrl))
+            ->orderBy('c.treePos', 'ASC')
+           ;
+
+        if ($allowBaseCategories) {
+            $qb->orWhere($qb->expr()->eq('a.accessUrlId', 1));
+        }
+
+        $query = $qb->getQuery();
 
         return $query->getResult();
     }
 
     /**
      * Get the number of course categories in an access url
+     * @param int $accessUrl
+     * @param bool $allowBaseCategories
      * @return int
      */
-    public function countAllInAccessUrl($accessUrl)
+    public function countAllInAccessUrl($accessUrl, $allowBaseCategories = false)
     {
         $qb = $this->createQueryBuilder('c');
-        $query = $qb
-            ->select('COUNT(c)')
+        $qb->select('COUNT(c)')
             ->innerJoin(
                 'ChamiloCoreBundle:AccessUrlRelCourseCategory',
                 'a',
@@ -52,8 +60,11 @@ class CourseCategoryRepository extends EntityRepository
             )
             ->where(
                 $qb->expr()->eq('a.accessUrlId', $accessUrl)
-            )
-            ->getQuery();
+            );
+
+        if ($allowBaseCategories) {
+            $qb->orWhere($qb->expr()->eq('a.accessUrlId', 1));
+        }
 
         $count = $qb->getQuery()->getSingleScalarResult();
 
diff --git a/src/CoreBundle/Entity/Repository/SequenceRepository.php b/src/CoreBundle/Entity/Repository/SequenceRepository.php
index abaea94637..f85540e50e 100644
--- a/src/CoreBundle/Entity/Repository/SequenceRepository.php
+++ b/src/CoreBundle/Entity/Repository/SequenceRepository.php
@@ -39,7 +39,7 @@ class SequenceRepository extends EntityRepository
     public function getRequirementAndDependencies($resourceId, $type)
     {
         $sequence = $this->findRequirementForResource($resourceId, $type);
-        $result = ['requirements' => '', 'dependencies' => ''];
+        $result = ['requirements' => '', 'dependencies' => []];
         if ($sequence && $sequence->hasGraph()) {
             $graph = $sequence->getSequence()->getUnSerializeGraph();
             $vertex = $graph->getVertex($resourceId);
diff --git a/src/CoreBundle/Entity/Skill.php b/src/CoreBundle/Entity/Skill.php
index a96fb6ab08..7762bf7e3e 100644
--- a/src/CoreBundle/Entity/Skill.php
+++ b/src/CoreBundle/Entity/Skill.php
@@ -5,7 +5,9 @@ namespace Chamilo\CoreBundle\Entity;
 
 use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
 use Chamilo\SkillBundle\Entity\Profile;
+use Chamilo\SkillBundle\Entity\SkillRelItem;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
 
@@ -96,6 +98,11 @@ class Skill
      */
     protected $issuedSkills;
 
+    /**
+     * @ORM\OneToMany(targetEntity="Chamilo\SkillBundle\Entity\SkillRelItem", mappedBy="skill", cascade={"persist"})
+     */
+    protected $items;
+
     /**
      * Constructor
      */
diff --git a/src/CoreBundle/Entity/SkillRelUser.php b/src/CoreBundle/Entity/SkillRelUser.php
index 5725e34dd0..8ed6bc139f 100644
--- a/src/CoreBundle/Entity/SkillRelUser.php
+++ b/src/CoreBundle/Entity/SkillRelUser.php
@@ -38,6 +38,7 @@ class SkillRelUser
      * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false)
      */
     private $user;
+
     /**
      * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\Skill", inversedBy="issuedSkills", cascade={"persist"})
      * @ORM\JoinColumn(name="skill_id", referencedColumnName="id", nullable=false)
@@ -99,6 +100,16 @@ class SkillRelUser
      */
     protected $comments;
 
+    /**
+     * Whether this has been confirmed by a teacher or not
+     * Only set to 0 when the skill_rel_item says requires_validation = 1
+     * @var integer
+     *
+     * // uncomment if api_get_configuration_value('allow_skill_rel_items')
+     * @ORM\Column(name="validation_status", type="integer")
+     */
+    protected $validationStatus;
+
     /**
      * SkillRelUser constructor.
      */
@@ -409,4 +420,22 @@ class SkillRelUser
 
         return number_format($average, 2);
     }
+
+    /**
+     * @return int
+     */
+    public function getValidationStatus()
+    {
+        return $this->validationStatus;
+    }
+
+    /**
+     * @param int $validationStatus
+     * @return SkillRelUser
+     */
+    public function setValidationStatus($validationStatus)
+    {
+        $this->validationStatus = $validationStatus;
+        return $this;
+    }
 }
diff --git a/src/FaqBundle/Entity/Category.php b/src/FaqBundle/Entity/Category.php
index e351a13e95..bfed9a3efe 100644
--- a/src/FaqBundle/Entity/Category.php
+++ b/src/FaqBundle/Entity/Category.php
@@ -11,7 +11,7 @@ use Knp\DoctrineBehaviors\Model as ORMBehaviors;
 /**
  * Class Category
  *
- * @ORM\Entity()
+ * @ORM\Entity(repositoryClass="Chamilo\FaqBundle\Entity\CategoryRepository")
  * @ORM\Table(
  *     name="faq_category",
  *     indexes={@ORM\Index(name="is_active_idx", columns={"is_active"})}
diff --git a/src/FaqBundle/Entity/Question.php b/src/FaqBundle/Entity/Question.php
index c35fba95f0..f07e7fe798 100644
--- a/src/FaqBundle/Entity/Question.php
+++ b/src/FaqBundle/Entity/Question.php
@@ -10,7 +10,7 @@ use Knp\DoctrineBehaviors\Model as ORMBehaviors;
 /**
  * Class Question
  *
- * @ORM\Entity()
+ * @ORM\Entity(repositoryClass="Chamilo\FaqBundle\Entity\QuestionRepository")
  * @ORM\Table(name="faq_question")
  * *
  * @package Chamilo\FaqBundle\Entity