Merge branch 'unstable' into feature/test

src/Muzich/CoreBundle/Entity/UsersElementsFavorites.php

@@ -34,7 +34,7 @@ class UsersElementsFavorites
    * Cet attribut contient l'objet Element lié
    * 
    * @ORM\ManyToOne(targetEntity="Element", inversedBy="users")
-   * @ORM\JoinColumn(name="tag_id", referencedColumnName="id")
+   * @ORM\JoinColumn(name="element_id", referencedColumnName="id")
    */
   protected $element;
   

src/Muzich/CoreBundle/lib/UnitTest.php

@@ -6,6 +6,8 @@ require_once(__DIR__ . "/../../../../app/AppKernel.php");
 
 class UnitTest extends \PHPUnit_Framework_TestCase
 {
+    protected $_container;
+  
   public function __construct()
   {
     $kernel = new \AppKernel("test", true);