diff --git a/main/inc/Entity/Course.php b/main/inc/Entity/Course.php
index 5ec073f52c..e4e53d48f4 100644
--- a/main/inc/Entity/Course.php
+++ b/main/inc/Entity/Course.php
@@ -207,10 +207,16 @@ class Course
      **/
     private $items;
 
+    /**
+     * @ORM\OneToMany(targetEntity="CurriculumCategory", mappedBy="course")
+     **/
+    //private $curriculumCategories;
+
     public function __construct()
     {
         $this->users = new ArrayCollection();
         $this->items = new ArrayCollection();
+        //$this->curriculumCategories = new ArrayCollection();
     }
 
     public function getItems()
diff --git a/main/inc/Entity/CurriculumCategory.php b/main/inc/Entity/CurriculumCategory.php
index 750b1ee0c1..c678e54ccd 100644
--- a/main/inc/Entity/CurriculumCategory.php
+++ b/main/inc/Entity/CurriculumCategory.php
@@ -6,7 +6,6 @@ use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
 use Doctrine\Common\Collections\ArrayCollection;
 
-
 /**
  * CurriculumCategory
  *
@@ -110,11 +109,35 @@ class CurriculumCategory
      */
     private $items;
 
+    /**
+     * @ORM\ManyToOne(targetEntity="Course")
+     * @ORM\JoinColumn(name="c_id", referencedColumnName="id")
+     */
+    private $course;
+
     public function __construct()
     {
         $this->items = new ArrayCollection();
     }
 
+    /**
+     * @return mixed
+     */
+    public function getCourse()
+    {
+        return $this->course;
+    }
+
+    /**
+     * @param Course $course
+     * @return mixed
+     */
+    public function setCourse(Course $course)
+    {
+        $this->course = $course;
+    }
+
+
     public function getItems()
     {
         return $this->items;
diff --git a/main/inc/Entity/Repository/UserRepository.php b/main/inc/Entity/Repository/UserRepository.php
index 819cf668f3..b65054b4cb 100644
--- a/main/inc/Entity/Repository/UserRepository.php
+++ b/main/inc/Entity/Repository/UserRepository.php
@@ -9,7 +9,6 @@ use Doctrine\ORM\NoResultException;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 
-
 /**
  * Class UserRepository
  * @package Entity\Repository
@@ -76,12 +75,11 @@ class UserRepository extends EntityRepository implements UserProviderInterface
     public function refreshUser(UserInterface $user)
     {
         return $user;
-
-        $class = get_class($user);
+        /*$class = get_class($user);
         if (!$this->supportsClass($class)) {
             throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', $class));
         }
-        return $this->loadUserByUsername($user->getUsername());
+        return $this->loadUserByUsername($user->getUsername());*/
     }
 
     /**
diff --git a/main/inc/Entity/User.php b/main/inc/Entity/User.php
index aa4fe65e64..f1a715c15b 100644
--- a/main/inc/Entity/User.php
+++ b/main/inc/Entity/User.php
@@ -6,6 +6,7 @@ use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\Common\Collections\ArrayCollection;
 use Symfony\Component\Security\Core\User\AdvancedUserInterface;
+use ChamiloLMS\Component\Auth;
 
 /**
  * User
@@ -314,7 +315,9 @@ class User implements AdvancedUserInterface, \Serializable
      */
     public function getRoles()
     {
-        return $this->roles->toArray();
+        $roles = $this->roles->toArray();
+        //$roles[] = new Auth\Role($this);
+        return $roles;
     }
 
     /**
diff --git a/main/inc/routes.php b/main/inc/routes.php
index c3c55320fa..4e64be5699 100644
--- a/main/inc/routes.php
+++ b/main/inc/routes.php
@@ -666,10 +666,11 @@ if ($alreadyInstalled) {
     $app->mount('/admin/jury_president', new ChamiloLMS\Provider\ReflectionControllerProvider('jury_president.controller'));
     $app->mount('/admin/jury_member', new ChamiloLMS\Provider\ReflectionControllerProvider('jury_member.controller'));
 
-    $app->mount('/courses/{courseCode}/curriculum/category', new ChamiloLMS\Provider\ReflectionControllerProvider('curriculum_category.controller'));
-    $app->mount('/courses/{courseCode}/curriculum/item', new ChamiloLMS\Provider\ReflectionControllerProvider('curriculum_item.controller'));
-    $app->mount('/courses/{courseCode}/curriculum/user', new ChamiloLMS\Provider\ReflectionControllerProvider('curriculum_user.controller'));
-    $app->mount('/courses/{courseCode}/curriculum', new ChamiloLMS\Provider\ReflectionControllerProvider('curriculum.controller'));
+
+    $app->mount('/courses/{course}/curriculum/category', new ChamiloLMS\Provider\ReflectionControllerProvider('curriculum_category.controller'));
+    $app->mount('/courses/{course}/curriculum/item', new ChamiloLMS\Provider\ReflectionControllerProvider('curriculum_item.controller'));
+    $app->mount('/courses/{course}/curriculum/user', new ChamiloLMS\Provider\ReflectionControllerProvider('curriculum_user.controller'));
+    $app->mount('/courses/{course}/curriculum', new ChamiloLMS\Provider\ReflectionControllerProvider('curriculum.controller'));
 
 }
 
diff --git a/main/inc/services.php b/main/inc/services.php
index 48d9b0607c..8583116960 100644
--- a/main/inc/services.php
+++ b/main/inc/services.php
@@ -716,4 +716,3 @@ $app['curriculum.controller'] = $app->share(
         return new ChamiloLMS\Controller\Tool\Curriculum\CurriculumController($app);
     }
 );
-
diff --git a/main/template/default/crud_macros/course_crud.tpl b/main/template/default/crud_macros/course_crud.tpl
index f1957ef2ce..ca8778857c 100644
--- a/main/template/default/crud_macros/course_crud.tpl
+++ b/main/template/default/crud_macros/course_crud.tpl
@@ -1,48 +1,48 @@
-{% macro list(items, links, courseCode) %}
-    <a href="{{ url(links.create_link, {'courseCode': courseCode }) }}">
+{% macro list(items, links, course) %}
+    <a href="{{ url(links.create_link, {'course': course.code }) }}">
         {{ 'Add' |trans }}
     </a>
     <table class="table">
     {% for item in items %}
         <tr>
             <td>
-                <a href="{{ url(links.read_link, {'courseCode': courseCode, id: item.id }) }}">
+                <a href="{{ url(links.read_link, {'course': course.code, id: item.id }) }}">
                 {{ item.name }}
                 </a>
             </td>
             <td>
-                <a class="btn" href="{{ url(links.update_link, {'courseCode': courseCode, id: item.id }) }}"> {{ 'Edit' |trans }}</a>
-                <a class="btn" href="{{ url(links.delete_link, {'courseCode': courseCode, id: item.id }) }}"> {{ 'Delete' |trans }}</a>
+                <a class="btn" href="{{ url(links.update_link, {'course': course.code, id: item.id }) }}"> {{ 'Edit' |trans }}</a>
+                <a class="btn" href="{{ url(links.delete_link, {'course': course.code, id: item.id }) }}"> {{ 'Delete' |trans }}</a>
             </td>
         </tr>
     {% endfor %}
     </table>
 {% endmacro %}
 
-{% macro add(form, links, courseCode) %}
-    <a href="{{ url(links.list_link, {'courseCode': courseCode }) }}">
+{% macro add(form, links, course) %}
+    <a href="{{ url(links.list_link, {'course': course.code }) }}">
         {{ 'List' |trans }}
     </a>
     <hr />
-    <form action="{{ url(links.create_link, {'courseCode': courseCode} ) }}" method="post" {{ form_enctype(form) }}>
+    <form action="{{ url(links.create_link, {'course': course.code }) }}" method="post" {{ form_enctype(form) }}>
         {{ form_widget(form) }}
     </form>
 {% endmacro %}
 
-{% macro edit(form, links, courseCode) %}
-    <a href="{{ url(links.list_link, {'courseCode': courseCode}) }}">
+{% macro edit(form, links, course) %}
+    <a href="{{ url(links.list_link, {'course': course.code}) }}">
         {{ 'List' |trans }}
     </a>
-    <form action="{{ url(links.update_link, {'courseCode': courseCode, id : item.id}) }}" method = "post" {{ form_enctype(form) }}>
+    <form action="{{ url(links.update_link, {'course': course.code, id : item.id }) }}" method = "post" {{ form_enctype(form) }}>
         {{ form_widget(form) }}
     </form>
 {% endmacro %}
 
-{% macro read(item, links, courseCode) %}
-    <a href="{{ url(links.list_link, {'courseCode': courseCode}) }}">
+{% macro read(item, links, course) %}
+    <a href="{{ url(links.list_link, {'course': course.code}) }}">
         {{ 'List' |trans }}
     </a>
-    <a href="{{ url(links.update_link, {'courseCode': courseCode, id : item.id}) }}">
+    <a href="{{ url(links.update_link, {'course': course.code, id : item.id }) }}">
         {{ 'Edit' |trans }}
     </a>
     <h2>{{ item.id }}</h2>
diff --git a/main/template/default/tool/curriculum/category/add.tpl b/main/template/default/tool/curriculum/category/add.tpl
index 2731f9cce2..146e5af322 100644
--- a/main/template/default/tool/curriculum/category/add.tpl
+++ b/main/template/default/tool/curriculum/category/add.tpl
@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
     {% import app.template_style ~ "/crud_macros/course_crud.tpl" as actions %}
-    {{ actions.add(form, links, app.request.get('courseCode')) }}
+    {{ actions.add(form, links, course) }}
 {% endblock %}
diff --git a/main/template/default/tool/curriculum/category/add_from_parent.tpl b/main/template/default/tool/curriculum/category/add_from_parent.tpl
index 09e66e8427..640a92b930 100644
--- a/main/template/default/tool/curriculum/category/add_from_parent.tpl
+++ b/main/template/default/tool/curriculum/category/add_from_parent.tpl
@@ -1,10 +1,10 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    <a href="{{ url(links.list_link, {'courseCode' : app.request.get('courseCode')}) }}">
-        List
+    <a href="{{ url(links.list_link, {'course' : course.code }) }}">
+        {{ 'Listing' |trans }}
     </a>
     <hr />
-    <form action="{{ url(links.add_from_parent_link, {'courseCode' : app.request.get('courseCode'), "id" : parent_id }) }}" method="post" {{ form_enctype(form) }}>
+    <form action="{{ url(links.add_from_parent_link, {'course' : course.code, "id" : parent_id }) }}" method="post" {{ form_enctype(form) }}>
         {{ form_widget(form) }}
     </form>
 {% endblock %}
diff --git a/main/template/default/tool/curriculum/category/edit.tpl b/main/template/default/tool/curriculum/category/edit.tpl
index 66ed4c6eb0..e8ee9615b8 100644
--- a/main/template/default/tool/curriculum/category/edit.tpl
+++ b/main/template/default/tool/curriculum/category/edit.tpl
@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
     {% import app.template_style ~ "/crud_macros/course_crud.tpl" as actions %}
-    {{ actions.edit(form, links, app.request.get('courseCode')) }}
+    {{ actions.edit(form, links, course) }}
 {% endblock %}
diff --git a/main/template/default/tool/curriculum/category/list.tpl b/main/template/default/tool/curriculum/category/list.tpl
index 290601a7c1..e6f1cca293 100644
--- a/main/template/default/tool/curriculum/category/list.tpl
+++ b/main/template/default/tool/curriculum/category/list.tpl
@@ -1,7 +1,7 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    <a href="{{ url(links.create_link, {'courseCode' : app.request.get('courseCode') }) }}">
-        Add
+    <a href="{{ url(links.create_link, {'course' : course.code }) }}">
+        {{ 'Add' |trans }}
     </a>
     {{ tree }}
 {% endblock %}
diff --git a/main/template/default/tool/curriculum/category/read.tpl b/main/template/default/tool/curriculum/category/read.tpl
index ff196288ac..852492d54f 100644
--- a/main/template/default/tool/curriculum/category/read.tpl
+++ b/main/template/default/tool/curriculum/category/read.tpl
@@ -5,7 +5,7 @@
     <ul>
     {% for subitem in subitems %}
         <li>
-            <a href="{{ url(links.question_score_name_read_link, {'courseCode' : app.request.get('courseCode'), id: subitem.id} ) }}">
+            <a href="{{ url(links.question_score_name_read_link, {'course' : course.code, id: subitem.id }) }}">
                 {{ subitem.name }}
             </a>
         </li>
diff --git a/src/ChamiloLMS/Component/Auth/Role.php b/src/ChamiloLMS/Component/Auth/Role.php
index 240b990f51..fa53426250 100644
--- a/src/ChamiloLMS/Component/Auth/Role.php
+++ b/src/ChamiloLMS/Component/Auth/Role.php
@@ -1,8 +1,22 @@
 <?php
+namespace ChamiloLMS\Component\Auth;
 /**
- * Created by JetBrains PhpStorm.
- * User: jmontoya
- * Date: 8/21/13
- * Time: 1:59 PM
- * To change this template use File | Settings | File Templates.
+ * Class Role
+ * @package ChamiloLMS\Component\Auth
  */
+
+use Symfony\Component\Security\Core\Role\RoleInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+
+class Role implements RoleInterface
+{
+    public function __construct(UserInterface $user)
+    {
+        $this->user = $user;
+    }
+
+    public function getRole()
+    {
+        //return 'ROLE_' . strtoupper($this->user->getUsername());
+    }
+}
diff --git a/src/ChamiloLMS/Controller/BaseController.php b/src/ChamiloLMS/Controller/BaseController.php
index 7014d45926..aa06da7d33 100644
--- a/src/ChamiloLMS/Controller/BaseController.php
+++ b/src/ChamiloLMS/Controller/BaseController.php
@@ -137,7 +137,7 @@ abstract class BaseController extends FlintController
     public function addAction()
     {
         $request = $this->getRequest();
-        $form = $this->get('form.factory')->create($this->getFormType());
+        $form = $this->get('form.factory')->create($this->getFormType(), $this->getDefaultEntity());
 
         if ($request->getMethod() == 'POST') {
             $form->bind($request);
@@ -473,4 +473,9 @@ abstract class BaseController extends FlintController
 
         return $entity;
     }
+
+    protected function getDefaultEntity()
+    {
+        return null;
+    }
 }
diff --git a/src/ChamiloLMS/Controller/CommonController.php b/src/ChamiloLMS/Controller/CommonController.php
index 81d2b5e608..65181d5060 100644
--- a/src/ChamiloLMS/Controller/CommonController.php
+++ b/src/ChamiloLMS/Controller/CommonController.php
@@ -54,7 +54,6 @@ class CommonController extends BaseController
      */
     protected function getTemplatePath()
     {
-
     }
 
     protected function generateDefaultCrudRoutes()
diff --git a/src/ChamiloLMS/Controller/Tool/Curriculum/CurriculumCategoryController.php b/src/ChamiloLMS/Controller/Tool/Curriculum/CurriculumCategoryController.php
index 6e08218ead..261e823bbb 100644
--- a/src/ChamiloLMS/Controller/Tool/Curriculum/CurriculumCategoryController.php
+++ b/src/ChamiloLMS/Controller/Tool/Curriculum/CurriculumCategoryController.php
@@ -19,38 +19,43 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
  */
 class CurriculumCategoryController extends CommonController
 {
+    private $course;
+
     /**
      *
      * @Route("/")
      * @Method({"GET"})
      */
-    public function indexAction($courseCode)
+    public function indexAction($course)
     {
+        $this->course = $course;
+        $template = $this->get('template');
+        $template->assign('course', $course);
+
         $options = array(
             'decorate' => true,
             'rootOpen' => '<ul>',
             'rootClose' => '</ul>',
             'childOpen' => '<li>',
             'childClose' => '</li>',
-            'nodeDecorator' => function ($row) use ($courseCode) {
+            'nodeDecorator' => function ($row) use ($course) {
+                $courseCode = $course->getId();
                 $addChildren = null;
                 $items = null;
                 if ($row['lvl'] <= 0) {
-
-                    $addChildren = '<a class="btn" href="'.$this->createUrl('add_from_parent_link', array('courseCode' => $courseCode, 'id' => $row['id'])).'">Add children</a>';
+                    $addChildren = '<a class="btn" href="'.$this->createUrl('add_from_parent_link', array('course' => $courseCode, 'id' => $row['id'])).'">Add children</a>';
                 } else {
-                    $addChildren = '<a class="btn" href="'.$this->createUrl('add_from_category', array('courseCode' => $courseCode, 'id' => $row['id'])).'">Add items</a>';
-                    //$items = $row['items'];
+                    $addChildren = '<a class="btn" href="'.$this->createUrl('add_from_category', array('course' => $courseCode, 'id' => $row['id'])).'">Add items</a>';
                     $items = '<ul>';
                     foreach ($row['items'] as $item) {
-                        $url = ' <a class="btn" href="'.$this->createUrl('edit_item', array('courseCode' => $courseCode, 'id' => $item['id'])).'">Edit</a>';
+                        $url = ' <a class="btn" href="'.$this->createUrl('edit_item', array('course' => $courseCode, 'id' => $item['id'])).'">Edit</a>';
                         $items.= '<li>'.$item['title']." (item) ".$url.'</li>';
                     }
                     $items .= '</ul>';
                 }
-                $readLink = '<a href="'.$this->createUrl('read_link', array('courseCode' => $courseCode, 'id' => $row['id'])).'">'.$row['title'].'</a>';
-                $editLink = '<a class="btn" href="'.$this->createUrl('update_link', array('courseCode' => $courseCode, 'id' => $row['id'])).'">Edit</a>';
-                $deleteLink = '<a class="btn" href="'.$this->createUrl('delete_link', array('courseCode' => $courseCode, 'id' => $row['id'])).'"/>Delete</a>';
+                $readLink = '<a href="'.$this->createUrl('read_link', array('course' => $courseCode, 'id' => $row['id'])).'">'.$row['title'].'</a>';
+                $editLink = '<a class="btn" href="'.$this->createUrl('update_link', array('course' => $courseCode, 'id' => $row['id'])).'">Edit</a>';
+                $deleteLink = '<a class="btn" href="'.$this->createUrl('delete_link', array('course' => $courseCode, 'id' => $row['id'])).'"/>Delete</a>';
 
                 return $readLink.' '.$addChildren.' '.$editLink.' '.$deleteLink.$items;
             }
@@ -66,8 +71,10 @@ class CurriculumCategoryController extends CommonController
             ->select('node, i')
             ->from('Entity\CurriculumCategory', 'node')
             ->leftJoin('node.items', 'i')
-            //->where('node.cId = 0')
+            ->innerJoin('node.course', 'c')
+            ->where('node.cId = :id')
             ->orderBy('node.root, node.lft', 'ASC')
+            ->setParameters(array('id' => $course->getId()))
             ->getQuery();
 
         $htmlTree = $repo->buildTree($query->getArrayResult(), $options);
@@ -93,8 +100,11 @@ class CurriculumCategoryController extends CommonController
     * @Route("/add")
     * @Method({"GET"})
     */
-    public function addCategoryAction($courseCode)
+    public function addCategoryAction($course)
     {
+        $this->course = $course;
+        $template = $this->get('template');
+        $template->assign('course', $course);
         return parent::addAction();
     }
 
@@ -202,4 +212,12 @@ class CurriculumCategoryController extends CommonController
     {
         return new CurriculumCategoryType();
     }
+
+    protected function getDefaultEntity()
+    {
+        $entity = $this->getNewEntity();
+        $entity->setCourse($this->course);
+        $entity->setSessionId(api_get_session_id());
+        return $entity;
+    }
 }
diff --git a/src/ChamiloLMS/Controller/Tool/Curriculum/CurriculumUserController.php b/src/ChamiloLMS/Controller/Tool/Curriculum/CurriculumUserController.php
index bca98a9a69..28998636d9 100644
--- a/src/ChamiloLMS/Controller/Tool/Curriculum/CurriculumUserController.php
+++ b/src/ChamiloLMS/Controller/Tool/Curriculum/CurriculumUserController.php
@@ -91,7 +91,7 @@ class CurriculumUserController extends CommonController
     public function saveUserItemAction()
     {
         $request = $this->getRequest();
-        $form = $this->get('form.factory')->create($this->getFormType());
+        $form = $this->get('form.factory')->create($this->getFormType(), $this->getDefaultEntity());
         $token = $this->get('security')->getToken();
         $user = $token->getUser();
 
diff --git a/src/ChamiloLMS/Form/CurriculumCategoryType.php b/src/ChamiloLMS/Form/CurriculumCategoryType.php
index ca85224fbc..0f25883875 100644
--- a/src/ChamiloLMS/Form/CurriculumCategoryType.php
+++ b/src/ChamiloLMS/Form/CurriculumCategoryType.php
@@ -11,7 +11,9 @@ class CurriculumCategoryType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builderData = $builder->getData();
+        /** @var Entity\CurriculumCategory $entity */
+        $entity = $builder->getData();
+
         /*$parentIdDisabled = false;
         if (!empty($builderData)) {
             $parentIdDisabled = true;
@@ -21,11 +23,18 @@ class CurriculumCategoryType extends AbstractType
         $builder->add('max_score', 'text');
         $builder->add('min_chars', 'text');
         $builder->add('min_chars', 'text');
+
+        $builder->add('c_id', 'hidden');
+        $builder->add('session_id', 'hidden');
+
         $builder->add('parent', 'entity', array(
             'class' => 'Entity\CurriculumCategory',
-            'query_builder' => function($repository) {
-                return $repository->createQueryBuilder('p')
-                    ->orderBy('p.title', 'ASC');
+            'query_builder' => function($repository) use ($entity) {
+                return $repository->createQueryBuilder('c')
+                    ->where('c.cId = :id')
+                    ->andWhere('c.sessionId = :session_id')
+                    ->setParameters(array('id' => $entity->getId(), 'session_id' => $entity->getSessionId()))
+                    ->orderBy('c.title', 'ASC');
             },
             'property' => 'title',
             'required' => false
diff --git a/src/ChamiloLMS/Middleware/CourseMiddleware.php b/src/ChamiloLMS/Middleware/CourseMiddleware.php
index d3ffc10107..641d18ae8e 100644
--- a/src/ChamiloLMS/Middleware/CourseMiddleware.php
+++ b/src/ChamiloLMS/Middleware/CourseMiddleware.php
@@ -1,15 +1,16 @@
 <?php
-/**
- * Created by JetBrains PhpStorm.
- * User: jmontoya
- * Date: 8/21/13
- * Time: 4:50 PM
- * To change this template use File | Settings | File Templates.
- */
 
 namespace ChamiloLMS\Middleware;
 
+/**
+ * Class CourseMiddleware
+ * @package ChamiloLMS\Middleware
+ */
+class CourseMiddleware
+{
 
-class CourseMiddleware {
-
+    public function __construct(Application $app, $course)
+    {
+        $app['template']->assign('course', $course);
+    }
 }
diff --git a/src/ChamiloLMS/Provider/ReflectionControllerProvider.php b/src/ChamiloLMS/Provider/ReflectionControllerProvider.php
index 154059dbc1..7a3a57e566 100644
--- a/src/ChamiloLMS/Provider/ReflectionControllerProvider.php
+++ b/src/ChamiloLMS/Provider/ReflectionControllerProvider.php
@@ -9,10 +9,9 @@ use Symfony\Component\Routing\Loader\AnnotationClassLoader;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-
 use Sensio\Bundle\FrameworkExtraBundle\Routing\AnnotatedRouteControllerLoader;
-
 use Doctrine\Common\Annotations\AnnotationReader;
+use ChamiloLMS\Middleware;
 
 class ReflectionControllerProvider implements ControllerProviderInterface
 {
@@ -41,7 +40,12 @@ class ReflectionControllerProvider implements ControllerProviderInterface
         }
 
         $reflection = new \ReflectionClass($app[$this->controllerName]);
+        $className = $reflection->getName();
+
+        // is a Chamilo course tool in order to convert course/{courseCode} into an entity
+        $isCourseTool = (strpos($className, 'ChamiloLMS\Controller\Tool') === false) ? false : true;
 
+        // Needed in order to get annotations
         $annotationReader = new AnnotationReader();
         $routeAnnotation = new Route(array());
         $methodAnnotation = new Method(array());
@@ -75,24 +79,42 @@ class ReflectionControllerProvider implements ControllerProviderInterface
             foreach ($routeObjects as $routeObject) {
 
                 if ($routeObject && is_a($routeObject, 'Symfony\Component\Routing\Annotation\Route')) {
-
                     $match = $controllers->match($routeObject->getPath(), $controllerName, $methodsToString);
 
                     // Setting requirements
+                    $req = $routeObject->getRequirements();
+
                     if (!empty($req)) {
                         foreach ($req as $key => $value) {
                             $match->assert($key, $value);
                         }
                     }
-                    $defaults = $routeObject->getDefaults();
-                    // Setting defaults
 
+                    // Setting defaults
+                    $defaults = $routeObject->getDefaults();
                     if (!empty($defaults)) {
                         foreach ($defaults as $key => $value) {
                             $match->value($key, $value);
                         }
                     }
 
+                    // Setting converts
+                    if ($isCourseTool) {
+
+                        // Converting /courses/XXX/ to a Entity/Course object
+
+                        $match->convert('course', function ($courseCode) use ($app, $match) {
+                            $course = $app['orm.em']->getRepository('Entity\Course')->findOneByCode($courseCode);
+
+                            // Set course stuff thanks to a before
+                            $match->before(new CourseMiddleware($app, $courseCode));
+                            return $course;
+                        });
+
+
+
+                    }
+
                     $match->bind($controllerName);
                 }
             }
diff --git a/vendor/alchemy/zippy/.gitignore b/vendor/alchemy/zippy/.gitignore
deleted file mode 100644
index 357feac89b..0000000000
--- a/vendor/alchemy/zippy/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/tests/phpunit_report
-/nbproject/
-/vendor/
-/docs/build
-composer.phar
-
diff --git a/vendor/alchemy/zippy/tests/Alchemy/Zippy/Tests/Resource/input/path/to/a/.gitignore b/vendor/alchemy/zippy/tests/Alchemy/Zippy/Tests/Resource/input/path/to/a/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/vendor/doctrine/collections/.gitignore b/vendor/doctrine/collections/.gitignore
deleted file mode 100644
index 48b8bf9072..0000000000
--- a/vendor/doctrine/collections/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vendor/
diff --git a/vendor/doctrine/common/.gitignore b/vendor/doctrine/common/.gitignore
deleted file mode 100644
index fb5e79d652..0000000000
--- a/vendor/doctrine/common/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build/
-logs/
-reports/
-dist/
diff --git a/vendor/doctrine/common/.gitmodules b/vendor/doctrine/common/.gitmodules
deleted file mode 100644
index 51f0843511..0000000000
--- a/vendor/doctrine/common/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "lib/vendor/doctrine-build-common"]
-	path = lib/vendor/doctrine-build-common
-	url = git://github.com/doctrine/doctrine-build-common.git
diff --git a/vendor/doctrine/common/tests/.gitignore b/vendor/doctrine/common/tests/.gitignore
deleted file mode 100644
index 7210405266..0000000000
--- a/vendor/doctrine/common/tests/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Doctrine/Tests/Proxies/
-Doctrine/Tests/ORM/Proxy/generated/
-Doctrine/Tests/ORM/Tools/Export/export
diff --git a/vendor/doctrine/dbal/.gitignore b/vendor/doctrine/dbal/.gitignore
deleted file mode 100644
index a9b57aaada..0000000000
--- a/vendor/doctrine/dbal/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-build/
-logs/
-reports/
-dist/
-download/
-lib/Doctrine/Common/
diff --git a/vendor/doctrine/dbal/.gitmodules b/vendor/doctrine/dbal/.gitmodules
deleted file mode 100644
index 00dc3fa1c4..0000000000
--- a/vendor/doctrine/dbal/.gitmodules
+++ /dev/null
@@ -1,9 +0,0 @@
-[submodule "lib/vendor/doctrine-common"]
-	path = lib/vendor/doctrine-common
-	url = git://github.com/doctrine/common.git
-[submodule "lib/vendor/Symfony/Component/Console"]
-	path = lib/vendor/Symfony/Component/Console
-	url = git://github.com/symfony/Console.git
-[submodule "lib/vendor/doctrine-build-common"]
-	path = lib/vendor/doctrine-build-common
-	url = git://github.com/doctrine/doctrine-build-common.git
diff --git a/vendor/doctrine/dbal/tests/.gitignore b/vendor/doctrine/dbal/tests/.gitignore
deleted file mode 100644
index 7210405266..0000000000
--- a/vendor/doctrine/dbal/tests/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Doctrine/Tests/Proxies/
-Doctrine/Tests/ORM/Proxy/generated/
-Doctrine/Tests/ORM/Tools/Export/export
diff --git a/vendor/doctrine/orm/.gitignore b/vendor/doctrine/orm/.gitignore
deleted file mode 100644
index b49fac4bf9..0000000000
--- a/vendor/doctrine/orm/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-build/
-logs/
-reports/
-dist/
-download/
-lib/api/
-lib/Doctrine/Common
-lib/Doctrine/DBAL
-/.settings/
-.buildpath
-.project
\ No newline at end of file
diff --git a/vendor/doctrine/orm/.gitmodules b/vendor/doctrine/orm/.gitmodules
deleted file mode 100644
index 2d52e9acde..0000000000
--- a/vendor/doctrine/orm/.gitmodules
+++ /dev/null
@@ -1,15 +0,0 @@
-[submodule "lib/vendor/doctrine-common"]
-	path = lib/vendor/doctrine-common
-	url = git://github.com/doctrine/common.git
-[submodule "lib/vendor/doctrine-dbal"]
-	path = lib/vendor/doctrine-dbal
-	url = git://github.com/doctrine/dbal.git
-[submodule "lib/vendor/Symfony/Component/Console"]
-	path = lib/vendor/Symfony/Component/Console
-	url = git://github.com/symfony/Console.git
-[submodule "lib/vendor/Symfony/Component/Yaml"]
-	path = lib/vendor/Symfony/Component/Yaml
-	url = git://github.com/symfony/Yaml.git
-[submodule "lib/vendor/doctrine-build-common"]
-	path = lib/vendor/doctrine-build-common
-	url = git://github.com/doctrine/doctrine-build-common.git
diff --git a/vendor/doctrine/orm/tests/.gitignore b/vendor/doctrine/orm/tests/.gitignore
deleted file mode 100644
index 7210405266..0000000000
--- a/vendor/doctrine/orm/tests/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Doctrine/Tests/Proxies/
-Doctrine/Tests/ORM/Proxy/generated/
-Doctrine/Tests/ORM/Tools/Export/export
diff --git a/vendor/ezyang/htmlpurifier/.gitattributes b/vendor/ezyang/htmlpurifier/.gitattributes
deleted file mode 100644
index 51e6483770..0000000000
--- a/vendor/ezyang/htmlpurifier/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-configdoc/usage.xml -crlf
diff --git a/vendor/ezyang/htmlpurifier/.gitignore b/vendor/ezyang/htmlpurifier/.gitignore
deleted file mode 100644
index 9fcd3c0eba..0000000000
--- a/vendor/ezyang/htmlpurifier/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-tags
-conf/
-test-settings.php
-config-schema.php
-library/HTMLPurifier/DefinitionCache/Serializer/*/
-library/standalone/
-library/HTMLPurifier.standalone.php
-library/HTMLPurifier*.tgz
-library/package*.xml
-smoketests/test-schema.html
-configdoc/*.html
-configdoc/configdoc.xml
-docs/doxygen*
-*.phpt.diff
-*.phpt.exp
-*.phpt.log
-*.phpt.out
-*.phpt.php
-*.phpt.skip.php
-*.htmlt.ini
-*.patch
-/*.php
-vendor
-composer.lock
diff --git a/vendor/ezyang/htmlpurifier/plugins/phorum/.gitignore b/vendor/ezyang/htmlpurifier/plugins/phorum/.gitignore
deleted file mode 100644
index 8325e09020..0000000000
--- a/vendor/ezyang/htmlpurifier/plugins/phorum/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-migrate.php
-htmlpurifier/*
diff --git a/vendor/guzzle/guzzle/.gitignore b/vendor/guzzle/guzzle/.gitignore
deleted file mode 100644
index bae9b5f748..0000000000
--- a/vendor/guzzle/guzzle/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Ingore common cruft
-.DS_STORE
-coverage
-.idea
-
-# Ignore binary files
-guzzle.phar
-guzzle-min.phar
-
-# Ignore potentially sensitive phpunit file
-phpunit.xml
-
-# Ignore composer generated files
-composer.phar
-composer.lock
-composer-test.lock
-vendor/
-
-# Ignore build files
-build/
-phing/build.properties
-
-# Ignore subsplit working directory
-.subsplit
diff --git a/vendor/mheap/silex-assetic/.gitignore b/vendor/mheap/silex-assetic/.gitignore
deleted file mode 100644
index 576695e133..0000000000
--- a/vendor/mheap/silex-assetic/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-vendor/
-composer.phar
-composer.lock
-example/assetic/output/*
-example/assetic/cache/*
diff --git a/vendor/mpdf/mpdf/.gitignore b/vendor/mpdf/mpdf/.gitignore
deleted file mode 100644
index 8f4a3b8e0f..0000000000
--- a/vendor/mpdf/mpdf/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/ttfontdata
-/tmp
-/graph_cache
diff --git a/vendor/pimple/pimple/.gitignore b/vendor/pimple/pimple/.gitignore
deleted file mode 100644
index ce3aa65218..0000000000
--- a/vendor/pimple/pimple/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-phpunit.xml
diff --git a/vendor/psr/log/.gitignore b/vendor/psr/log/.gitignore
deleted file mode 100644
index 22d0d82f80..0000000000
--- a/vendor/psr/log/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vendor
diff --git a/vendor/silex/silex/.gitignore b/vendor/silex/silex/.gitignore
deleted file mode 100644
index 3d4ff050e2..0000000000
--- a/vendor/silex/silex/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/phpunit.xml
-/vendor
-/build
-/composer.lock
-
diff --git a/vendor/swiftmailer/swiftmailer/.gitignore b/vendor/swiftmailer/swiftmailer/.gitignore
deleted file mode 100644
index 0aa62f55c9..0000000000
--- a/vendor/swiftmailer/swiftmailer/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.DS_Store
-tests/acceptance.conf.php
-tests/smoke.conf.php
-build/*
-.project
-.settings/*
diff --git a/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/.gitignore b/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/browser-kit/Symfony/Component/BrowserKit/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/config/Symfony/Component/Config/.gitignore b/vendor/symfony/config/Symfony/Component/Config/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/config/Symfony/Component/Config/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/console/Symfony/Component/Console/.gitignore b/vendor/symfony/console/Symfony/Component/Console/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/console/Symfony/Component/Console/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/debug/Symfony/Component/Debug/.gitignore b/vendor/symfony/debug/Symfony/Component/Debug/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/debug/Symfony/Component/Debug/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/.gitignore b/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/.gitignore b/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/dom-crawler/Symfony/Component/DomCrawler/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/.gitignore b/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/event-dispatcher/Symfony/Component/EventDispatcher/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/filesystem/Symfony/Component/Filesystem/.gitignore b/vendor/symfony/filesystem/Symfony/Component/Filesystem/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/filesystem/Symfony/Component/Filesystem/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/form/Symfony/Component/Form/.gitignore b/vendor/symfony/form/Symfony/Component/Form/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/form/Symfony/Component/Form/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/framework-bundle/Symfony/Bundle/FrameworkBundle/.gitignore b/vendor/symfony/framework-bundle/Symfony/Bundle/FrameworkBundle/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/framework-bundle/Symfony/Bundle/FrameworkBundle/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/.gitignore b/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/.gitignore b/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/.gitignore
deleted file mode 100644
index 22450b759c..0000000000
--- a/vendor/symfony/http-kernel/Symfony/Component/HttpKernel/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
-Tests/ProjectContainer.php
-Tests/classes.map
diff --git a/vendor/symfony/icu/Symfony/Component/Icu/.gitignore b/vendor/symfony/icu/Symfony/Component/Icu/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/icu/Symfony/Component/Icu/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/intl/Symfony/Component/Intl/.gitignore b/vendor/symfony/intl/Symfony/Component/Intl/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/intl/Symfony/Component/Intl/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/locale/Symfony/Component/Locale/.gitignore b/vendor/symfony/locale/Symfony/Component/Locale/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/locale/Symfony/Component/Locale/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/monolog-bridge/Symfony/Bridge/Monolog/.gitignore b/vendor/symfony/monolog-bridge/Symfony/Bridge/Monolog/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/monolog-bridge/Symfony/Bridge/Monolog/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/options-resolver/Symfony/Component/OptionsResolver/.gitignore b/vendor/symfony/options-resolver/Symfony/Component/OptionsResolver/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/options-resolver/Symfony/Component/OptionsResolver/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/process/Symfony/Component/Process/.gitignore b/vendor/symfony/process/Symfony/Component/Process/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/process/Symfony/Component/Process/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/routing/Symfony/Component/Routing/.gitignore b/vendor/symfony/routing/Symfony/Component/Routing/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/routing/Symfony/Component/Routing/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/security/Symfony/Component/Security/.gitignore b/vendor/symfony/security/Symfony/Component/Security/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/security/Symfony/Component/Security/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/stopwatch/Symfony/Component/Stopwatch/.gitattributes b/vendor/symfony/stopwatch/Symfony/Component/Stopwatch/.gitattributes
deleted file mode 100644
index e742c9b351..0000000000
--- a/vendor/symfony/stopwatch/Symfony/Component/Stopwatch/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-Tests/ export-ignore
-phpunit.xml.dist export-ignore
diff --git a/vendor/symfony/stopwatch/Symfony/Component/Stopwatch/.gitignore b/vendor/symfony/stopwatch/Symfony/Component/Stopwatch/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/stopwatch/Symfony/Component/Stopwatch/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/templating/Symfony/Component/Templating/.gitignore b/vendor/symfony/templating/Symfony/Component/Templating/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/templating/Symfony/Component/Templating/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/translation/Symfony/Component/Translation/.gitignore b/vendor/symfony/translation/Symfony/Component/Translation/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/translation/Symfony/Component/Translation/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/.gitignore b/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/twig-bridge/Symfony/Bridge/Twig/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/validator/Symfony/Component/Validator/.gitignore b/vendor/symfony/validator/Symfony/Component/Validator/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/validator/Symfony/Component/Validator/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/web-profiler-bundle/Symfony/Bundle/WebProfilerBundle/.gitignore b/vendor/symfony/web-profiler-bundle/Symfony/Bundle/WebProfilerBundle/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/web-profiler-bundle/Symfony/Bundle/WebProfilerBundle/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/.gitignore b/vendor/symfony/yaml/Symfony/Component/Yaml/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/twig/twig/.gitignore b/vendor/twig/twig/.gitignore
deleted file mode 100644
index 840b78e7e4..0000000000
--- a/vendor/twig/twig/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/ext/twig/autom4te.cache/
-
diff --git a/vendor/twig/twig/ext/twig/.gitignore b/vendor/twig/twig/ext/twig/.gitignore
deleted file mode 100644
index 56ea76cc26..0000000000
--- a/vendor/twig/twig/ext/twig/.gitignore
+++ /dev/null
@@ -1,30 +0,0 @@
-*.sw*
-.deps
-Makefile
-Makefile.fragments
-Makefile.global
-Makefile.objects
-acinclude.m4
-aclocal.m4
-build/
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.nice
-config.status
-config.sub
-configure
-configure.in
-install-sh
-libtool
-ltmain.sh
-missing
-mkinstalldirs
-run-tests.php
-twig.loT
-.libs/
-modules/
-twig.la
-twig.lo