diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/City.php~ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/City.php~
deleted file mode 100644
index ba190065..00000000
--- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/City.php~
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-namespace Cadoles\CoreBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\ArrayCollection;
-
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Validator\Constraints as Assert;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="city")
- * @ORM\HasLifecycleCallbacks()
- *
- * @UniqueEntity(fields="code", message="Une commune existe déjà avec ce code")
- */
-class City
-{
-    /**
-     * @ORM\Column(type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @ORM\Column(type="string", length=20, unique=true)
-     */
-    private $code;
-
-    /**
-     * @ORM\Column(type="string", length=250)
-     */
-    private $label;
-
-    /**
-     * @var ArrayCollection $users
-     * @var User
-     *
-     * @ORM\OneToMany(targetEntity="User", mappedBy="birthplace")
-     * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
-     */
-    private $users;    
-
-    /**
-     * @var ArrayCollection $registrations
-     * @var User
-     *
-     * @ORM\OneToMany(targetEntity="Registration", mappedBy="birthplace")
-     * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
-     */
-    private $registrations;  
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->users = new \Doctrine\Common\Collections\ArrayCollection();
-    }
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set code
-     *
-     * @param string $code
-     *
-     * @return City
-     */
-    public function setCode($code)
-    {
-        $this->code = $code;
-
-        return $this;
-    }
-
-    /**
-     * Get code
-     *
-     * @return string
-     */
-    public function getCode()
-    {
-        return $this->code;
-    }
-
-    /**
-     * Set label
-     *
-     * @param string $label
-     *
-     * @return City
-     */
-    public function setLabel($label)
-    {
-        $this->label = $label;
-
-        return $this;
-    }
-
-    /**
-     * Get label
-     *
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->label;
-    }
-
-    /**
-     * Add user
-     *
-     * @param \Cadoles\CoreBundle\Entity\User $user
-     *
-     * @return City
-     */
-    public function addUser(\Cadoles\CoreBundle\Entity\User $user)
-    {
-        $this->users[] = $user;
-
-        return $this;
-    }
-
-    /**
-     * Remove user
-     *
-     * @param \Cadoles\CoreBundle\Entity\User $user
-     */
-    public function removeUser(\Cadoles\CoreBundle\Entity\User $user)
-    {
-        $this->users->removeElement($user);
-    }
-
-    /**
-     * Get users
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getUsers()
-    {
-        return $this->users;
-    }
-
-    /**
-     * Add registration
-     *
-     * @param \Cadoles\CoreBundle\Entity\Registration $registration
-     *
-     * @return City
-     */
-    public function addRegistration(\Cadoles\CoreBundle\Entity\Registration $registration)
-    {
-        $this->registrations[] = $registration;
-
-        return $this;
-    }
-
-    /**
-     * Remove registration
-     *
-     * @param \Cadoles\CoreBundle\Entity\Registration $registration
-     */
-    public function removeRegistration(\Cadoles\CoreBundle\Entity\Registration $registration)
-    {
-        $this->registrations->removeElement($registration);
-    }
-
-    /**
-     * Get registrations
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getRegistrations()
-    {
-        return $this->registrations;
-    }
-}
diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Config.php~ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Config.php~
deleted file mode 100644
index 0dcd41cc..00000000
--- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Config.php~
+++ /dev/null
@@ -1,322 +0,0 @@
-<?php
-namespace Cadoles\CoreBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-
-/**
-  * @ORM\Entity
-  * @ORM\Table(name="config",indexes={@ORM\Index(name="order", columns={"order"})})
-  */
-class Config
-{
-    /**
-     * @ORM\Id
-     * @ORM\Column(type="string")
-     */
-    protected $id;
-
-    /**
-     * @ORM\Column(type="string", length=250)
-     */
-    protected $value;
-
-    /**
-     * @ORM\Column(type="string")
-     */
-    protected $order;
-
-    /**
-     * @ORM\Column(type="boolean")
-     */
-    protected $visible;
-
-    /**
-     * @ORM\Column(type="boolean")
-     */
-    protected $changeable;
-
-    /**
-     * @ORM\Column(type="boolean")
-     */
-    protected $required;
-
-    /**
-     * @ORM\Column(type="string")
-     */
-    protected $type;
-
-    /**
-     * @ORM\Column(type="string")
-     */
-    protected $grouped;
-
-    /**
-     * @ORM\Column(type="text")
-     */
-    protected $help;
-
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set key
-     *
-     * @param string $key
-     *
-     * @return Config
-     */
-    public function setKey($key)
-    {
-        $this->key = $key;
-
-        return $this;
-    }
-
-    /**
-     * Get key
-     *
-     * @return string
-     */
-    public function getKey()
-    {
-        return $this->key;
-    }
-
-    /**
-     * Set value
-     *
-     * @param string $value
-     *
-     * @return Config
-     */
-    public function setValue($value)
-    {
-        $this->value = $value;
-
-        return $this;
-    }
-
-    /**
-     * Get value
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Set order
-     *
-     * @param integer $order
-     *
-     * @return Config
-     */
-    public function setOrder($order)
-    {
-        $this->order = $order;
-
-        return $this;
-    }
-
-    /**
-     * Get order
-     *
-     * @return integer
-     */
-    public function getOrder()
-    {
-        return $this->order;
-    }
-
-    /**
-     * Set visible
-     *
-     * @param boolean $visible
-     *
-     * @return Config
-     */
-    public function setVisible($visible)
-    {
-        $this->visible = $visible;
-
-        return $this;
-    }
-
-    /**
-     * Get visible
-     *
-     * @return boolean
-     */
-    public function getVisible()
-    {
-        return $this->visible;
-    }
-
-    /**
-     * Set type
-     *
-     * @param string $type
-     *
-     * @return Config
-     */
-    public function setType($type)
-    {
-        $this->type = $type;
-
-        return $this;
-    }
-
-    /**
-     * Get type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Set id
-     *
-     * @param string $id
-     *
-     * @return Config
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-
-        return $this;
-    }
-
-    /**
-     * Set changeable
-     *
-     * @param boolean $changeable
-     *
-     * @return Config
-     */
-    public function setChangeable($changeable)
-    {
-        $this->changeable = $changeable;
-
-        return $this;
-    }
-
-    /**
-     * Get changeable
-     *
-     * @return boolean
-     */
-    public function getChangeable()
-    {
-        return $this->changeable;
-    }
-
-    /**
-     * Set required
-     *
-     * @param boolean $required
-     *
-     * @return Config
-     */
-    public function setRequired($required)
-    {
-        $this->required = $required;
-
-        return $this;
-    }
-
-    /**
-     * Get required
-     *
-     * @return boolean
-     */
-    public function getRequired()
-    {
-        return $this->required;
-    }
-
-    /**
-     * Set group
-     *
-     * @param string $group
-     *
-     * @return Config
-     */
-    public function setGroup($group)
-    {
-        $this->group = $group;
-
-        return $this;
-    }
-
-    /**
-     * Get group
-     *
-     * @return string
-     */
-    public function getGroup()
-    {
-        return $this->group;
-    }
-
-    /**
-     * Set help
-     *
-     * @param string $help
-     *
-     * @return Config
-     */
-    public function setHelp($help)
-    {
-        $this->help = $help;
-
-        return $this;
-    }
-
-    /**
-     * Get help
-     *
-     * @return string
-     */
-    public function getHelp()
-    {
-        return $this->help;
-    }
-
-    /**
-     * Set grouped
-     *
-     * @param string $grouped
-     *
-     * @return Config
-     */
-    public function setGrouped($grouped)
-    {
-        $this->grouped = $grouped;
-
-        return $this;
-    }
-
-    /**
-     * Get grouped
-     *
-     * @return string
-     */
-    public function getGrouped()
-    {
-        return $this->grouped;
-    }
-}
diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Country.php~ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Country.php~
deleted file mode 100644
index c201db86..00000000
--- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Country.php~
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-namespace Cadoles\CoreBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\ArrayCollection;
-
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Validator\Constraints as Assert;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="country")
- * @ORM\HasLifecycleCallbacks()
- *
- */
-class Country
-{
-    /**
-     * @ORM\Column(type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @ORM\Column(type="string", length=20)
-     */
-    private $code;
-
-    /**
-     * @ORM\Column(type="string", length=250)
-     */
-    private $label;
-
-    /**
-     * @var ArrayCollection $users
-     * @var User
-     *
-     * @ORM\OneToMany(targetEntity="User", mappedBy="birthcountry")
-     * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
-     */
-    private $users;
-
-    /**
-     * @var ArrayCollection $registrations
-     * @var User
-     *
-     * @ORM\OneToMany(targetEntity="Registration", mappedBy="birthcountry")
-     * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
-     */
-    private $registrations;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->users = new \Doctrine\Common\Collections\ArrayCollection();
-    }
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set code
-     *
-     * @param string $code
-     *
-     * @return Country
-     */
-    public function setCode($code)
-    {
-        $this->code = $code;
-
-        return $this;
-    }
-
-    /**
-     * Get code
-     *
-     * @return string
-     */
-    public function getCode()
-    {
-        return $this->code;
-    }
-
-    /**
-     * Set label
-     *
-     * @param string $label
-     *
-     * @return Country
-     */
-    public function setLabel($label)
-    {
-        $this->label = $label;
-
-        return $this;
-    }
-
-    /**
-     * Get label
-     *
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->label;
-    }
-
-    /**
-     * Add user
-     *
-     * @param \Cadoles\CoreBundle\Entity\User $user
-     *
-     * @return Country
-     */
-    public function addUser(\Cadoles\CoreBundle\Entity\User $user)
-    {
-        $this->users[] = $user;
-
-        return $this;
-    }
-
-    /**
-     * Remove user
-     *
-     * @param \Cadoles\CoreBundle\Entity\User $user
-     */
-    public function removeUser(\Cadoles\CoreBundle\Entity\User $user)
-    {
-        $this->users->removeElement($user);
-    }
-
-    /**
-     * Get users
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getUsers()
-    {
-        return $this->users;
-    }
-
-    /**
-     * Add registration
-     *
-     * @param \Cadoles\CoreBundle\Entity\Registration $registration
-     *
-     * @return Country
-     */
-    public function addRegistration(\Cadoles\CoreBundle\Entity\Registration $registration)
-    {
-        $this->registrations[] = $registration;
-
-        return $this;
-    }
-
-    /**
-     * Remove registration
-     *
-     * @param \Cadoles\CoreBundle\Entity\Registration $registration
-     */
-    public function removeRegistration(\Cadoles\CoreBundle\Entity\Registration $registration)
-    {
-        $this->registrations->removeElement($registration);
-    }
-
-    /**
-     * Get registrations
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getRegistrations()
-    {
-        return $this->registrations;
-    }
-}
diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Group.php~ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Group.php~
deleted file mode 100644
index 98c2d0f8..00000000
--- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Group.php~
+++ /dev/null
@@ -1,339 +0,0 @@
-<?php
-namespace Cadoles\CoreBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\ArrayCollection;
-
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Validator\Constraints as Assert;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="groupe")
- * @ORM\HasLifecycleCallbacks()
- * @ORM\Entity(repositoryClass="Cadoles\CoreBundle\Repository\GroupRepository")
- * 
- * @UniqueEntity(fields="label", message="Un group existe déjà avec ce label")
- */
-class Group
-{
-    /**
-     * @ORM\Column(type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @ORM\Column(type="string", length=250, unique=true)
-     */
-    private $label;
-
-    /**
-     * @ORM\Column(type="boolean")
-     */
-    private $fgopen;
-    
-    /**
-     * @ORM\Column(type="boolean")
-     */
-    private $fgall;
-
-    /**
-     * @ORM\Column(type="boolean")
-     */
-    private $fgtemplate;    
-
-    /**
-     * @ORM\Column(type="text", nullable=true)
-     */
-    private $ldapfilter;
-
-    /**
-     * @ORM\Column(type="text", nullable=true)
-     */
-    private $attributes;
-
-    /**
-     * @var ArrayCollection $users
-     * @var UserGroup
-     *
-     * @ORM\OneToMany(targetEntity="UserGroup", mappedBy="group", cascade={"persist"}, orphanRemoval=true)
-     */
-    private $users;
-
-    /**
-    * @ORM\ManyToMany(targetEntity="Cadoles\PortalBundle\Entity\Item", mappedBy="groups")
-    */    
-    protected $items;
-
-    /**
-    * @ORM\ManyToMany(targetEntity="Cadoles\PortalBundle\Entity\Alert", mappedBy="groups")
-    */    
-    protected $alerts;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->users = new \Doctrine\Common\Collections\ArrayCollection();
-        $this->items = new \Doctrine\Common\Collections\ArrayCollection();
-    }
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set label
-     *
-     * @param string $label
-     *
-     * @return Group
-     */
-    public function setLabel($label)
-    {
-        $this->label = $label;
-
-        return $this;
-    }
-
-    /**
-     * Get label
-     *
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->label;
-    }
-
-    /**
-     * Set fgopen
-     *
-     * @param boolean $fgopen
-     *
-     * @return Group
-     */
-    public function setFgopen($fgopen)
-    {
-        $this->fgopen = $fgopen;
-
-        return $this;
-    }
-
-    /**
-     * Get fgopen
-     *
-     * @return boolean
-     */
-    public function getFgopen()
-    {
-        return $this->fgopen;
-    }
-
-    /**
-     * Set fgall
-     *
-     * @param boolean $fgall
-     *
-     * @return Group
-     */
-    public function setFgall($fgall)
-    {
-        $this->fgall = $fgall;
-
-        return $this;
-    }
-
-    /**
-     * Get fgall
-     *
-     * @return boolean
-     */
-    public function getFgall()
-    {
-        return $this->fgall;
-    }
-
-    /**
-     * Set fgtemplate
-     *
-     * @param boolean $fgtemplate
-     *
-     * @return Group
-     */
-    public function setFgtemplate($fgtemplate)
-    {
-        $this->fgtemplate = $fgtemplate;
-
-        return $this;
-    }
-
-    /**
-     * Get fgtemplate
-     *
-     * @return boolean
-     */
-    public function getFgtemplate()
-    {
-        return $this->fgtemplate;
-    }
-
-    /**
-     * Set ldapfilter
-     *
-     * @param string $ldapfilter
-     *
-     * @return Group
-     */
-    public function setLdapfilter($ldapfilter)
-    {
-        $this->ldapfilter = $ldapfilter;
-
-        return $this;
-    }
-
-    /**
-     * Get ldapfilter
-     *
-     * @return string
-     */
-    public function getLdapfilter()
-    {
-        return $this->ldapfilter;
-    }
-
-    /**
-     * Set attributes
-     *
-     * @param string $attributes
-     *
-     * @return Group
-     */
-    public function setAttributes($attributes)
-    {
-        $this->attributes = $attributes;
-
-        return $this;
-    }
-
-    /**
-     * Get attributes
-     *
-     * @return string
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * Add user
-     *
-     * @param \Cadoles\CoreBundle\Entity\UserGroup $user
-     *
-     * @return Group
-     */
-    public function addUser(\Cadoles\CoreBundle\Entity\UserGroup $user)
-    {
-        $this->users[] = $user;
-
-        return $this;
-    }
-
-    /**
-     * Remove user
-     *
-     * @param \Cadoles\CoreBundle\Entity\UserGroup $user
-     */
-    public function removeUser(\Cadoles\CoreBundle\Entity\UserGroup $user)
-    {
-        $this->users->removeElement($user);
-    }
-
-    /**
-     * Get users
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getUsers()
-    {
-        return $this->users;
-    }
-
-    /**
-     * Add item
-     *
-     * @param \Cadoles\PortalBundle\Entity\Item $item
-     *
-     * @return Group
-     */
-    public function addItem(\Cadoles\PortalBundle\Entity\Item $item)
-    {
-        $this->items[] = $item;
-
-        return $this;
-    }
-
-    /**
-     * Remove item
-     *
-     * @param \Cadoles\PortalBundle\Entity\Item $item
-     */
-    public function removeItem(\Cadoles\PortalBundle\Entity\Item $item)
-    {
-        $this->items->removeElement($item);
-    }
-
-    /**
-     * Get items
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getItems()
-    {
-        return $this->items;
-    }
-
-    /**
-     * Add alert
-     *
-     * @param \Cadoles\PortalBundle\Entity\Alert $alert
-     *
-     * @return Group
-     */
-    public function addAlert(\Cadoles\PortalBundle\Entity\Alert $alert)
-    {
-        $this->alerts[] = $alert;
-
-        return $this;
-    }
-
-    /**
-     * Remove alert
-     *
-     * @param \Cadoles\PortalBundle\Entity\Alert $alert
-     */
-    public function removeAlert(\Cadoles\PortalBundle\Entity\Alert $alert)
-    {
-        $this->alerts->removeElement($alert);
-    }
-
-    /**
-     * Get alerts
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getAlerts()
-    {
-        return $this->alerts;
-    }
-}
diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Niveau01.php~ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Niveau01.php~
deleted file mode 100644
index 9f49594c..00000000
--- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Niveau01.php~
+++ /dev/null
@@ -1,332 +0,0 @@
-<?php
-namespace Cadoles\CoreBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\ArrayCollection;
-
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Validator\Constraints as Assert;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="niveau01")
- * @ORM\HasLifecycleCallbacks()
- * @ORM\Entity(repositoryClass="Cadoles\CoreBundle\Repository\Niveau01Repository")
- * 
- * @UniqueEntity(fields="label", message="Un Niveau de rang 1 existe déjà avec ce label")
- */
-class Niveau01
-{
-    /**
-     * @ORM\Column(type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @ORM\Column(type="string", length=250, unique=true)
-     */
-    private $label;
-
-    /**
-     * @ORM\Column(type="string", length=9)
-     */
-    private $siren;
-
-    /**
-     * @ORM\Column(type="text", nullable=true)
-     */
-    private $ldapfilter;
-
-    /**
-     * @ORM\Column(type="text", nullable=true)
-     */
-    private $attributes;
-
-    /**
-     * @var ArrayCollection $niveau02s
-     * @var Registration
-     *
-     * @ORM\OneToMany(targetEntity="Niveau02", mappedBy="niveau01", cascade={"persist"}, orphanRemoval=false)
-     */
-    private $niveau02s;
-
-    /**
-     * @var ArrayCollection $registrations
-     * @var Registration
-     *
-     * @ORM\OneToMany(targetEntity="Registration", mappedBy="niveau01", cascade={"persist"}, orphanRemoval=false)
-     */
-    private $registrations;
-
-        /**
-     * @var ArrayCollection $users
-     * @var User
-     *
-     * @ORM\OneToMany(targetEntity="User", mappedBy="niveau01", cascade={"persist"}, orphanRemoval=false)
-     */
-    private $users;
-
-        /**
-     * @var ArrayCollection $modos
-     * @var User
-     *
-     * @ORM\OneToMany(targetEntity="UserModo", mappedBy="niveau01", cascade={"persist"}, orphanRemoval=false)
-     */
-    private $modos;
-
-    
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->niveau02s = new \Doctrine\Common\Collections\ArrayCollection();
-        $this->registrations = new \Doctrine\Common\Collections\ArrayCollection();
-        $this->users = new \Doctrine\Common\Collections\ArrayCollection();
-        $this->modos = new \Doctrine\Common\Collections\ArrayCollection();
-    }
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set label
-     *
-     * @param string $label
-     *
-     * @return Niveau01
-     */
-    public function setLabel($label)
-    {
-        $this->label = $label;
-
-        return $this;
-    }
-
-    /**
-     * Get label
-     *
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->label;
-    }
-
-    /**
-     * Set siren
-     *
-     * @param string $siren
-     *
-     * @return Niveau01
-     */
-    public function setSiren($siren)
-    {
-        $this->siren = $siren;
-
-        return $this;
-    }
-
-    /**
-     * Get siren
-     *
-     * @return string
-     */
-    public function getSiren()
-    {
-        return $this->siren;
-    }
-
-    /**
-     * Set ldapfilter
-     *
-     * @param string $ldapfilter
-     *
-     * @return Niveau01
-     */
-    public function setLdapfilter($ldapfilter)
-    {
-        $this->ldapfilter = $ldapfilter;
-
-        return $this;
-    }
-
-    /**
-     * Get ldapfilter
-     *
-     * @return string
-     */
-    public function getLdapfilter()
-    {
-        return $this->ldapfilter;
-    }
-
-    /**
-     * Set attributes
-     *
-     * @param string $attributes
-     *
-     * @return Niveau01
-     */
-    public function setAttributes($attributes)
-    {
-        $this->attributes = $attributes;
-
-        return $this;
-    }
-
-    /**
-     * Get attributes
-     *
-     * @return string
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * Add niveau02
-     *
-     * @param \Cadoles\CoreBundle\Entity\Niveau02 $niveau02
-     *
-     * @return Niveau01
-     */
-    public function addNiveau02(\Cadoles\CoreBundle\Entity\Niveau02 $niveau02)
-    {
-        $this->niveau02s[] = $niveau02;
-
-        return $this;
-    }
-
-    /**
-     * Remove niveau02
-     *
-     * @param \Cadoles\CoreBundle\Entity\Niveau02 $niveau02
-     */
-    public function removeNiveau02(\Cadoles\CoreBundle\Entity\Niveau02 $niveau02)
-    {
-        $this->niveau02s->removeElement($niveau02);
-    }
-
-    /**
-     * Get niveau02s
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getNiveau02s()
-    {
-        return $this->niveau02s;
-    }
-
-    /**
-     * Add registration
-     *
-     * @param \Cadoles\CoreBundle\Entity\Registration $registration
-     *
-     * @return Niveau01
-     */
-    public function addRegistration(\Cadoles\CoreBundle\Entity\Registration $registration)
-    {
-        $this->registrations[] = $registration;
-
-        return $this;
-    }
-
-    /**
-     * Remove registration
-     *
-     * @param \Cadoles\CoreBundle\Entity\Registration $registration
-     */
-    public function removeRegistration(\Cadoles\CoreBundle\Entity\Registration $registration)
-    {
-        $this->registrations->removeElement($registration);
-    }
-
-    /**
-     * Get registrations
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getRegistrations()
-    {
-        return $this->registrations;
-    }
-
-    /**
-     * Add user
-     *
-     * @param \Cadoles\CoreBundle\Entity\User $user
-     *
-     * @return Niveau01
-     */
-    public function addUser(\Cadoles\CoreBundle\Entity\User $user)
-    {
-        $this->users[] = $user;
-
-        return $this;
-    }
-
-    /**
-     * Remove user
-     *
-     * @param \Cadoles\CoreBundle\Entity\User $user
-     */
-    public function removeUser(\Cadoles\CoreBundle\Entity\User $user)
-    {
-        $this->users->removeElement($user);
-    }
-
-    /**
-     * Get users
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getUsers()
-    {
-        return $this->users;
-    }
-
-    /**
-     * Add modo
-     *
-     * @param \Cadoles\CoreBundle\Entity\UserModo $modo
-     *
-     * @return Niveau01
-     */
-    public function addModo(\Cadoles\CoreBundle\Entity\UserModo $modo)
-    {
-        $this->modos[] = $modo;
-
-        return $this;
-    }
-
-    /**
-     * Remove modo
-     *
-     * @param \Cadoles\CoreBundle\Entity\UserModo $modo
-     */
-    public function removeModo(\Cadoles\CoreBundle\Entity\UserModo $modo)
-    {
-        $this->modos->removeElement($modo);
-    }
-
-    /**
-     * Get modos
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getModos()
-    {
-        return $this->modos;
-    }
-}
diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Niveau02.php~ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Niveau02.php~
deleted file mode 100644
index cd406662..00000000
--- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Niveau02.php~
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-namespace Cadoles\CoreBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\ArrayCollection;
-
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Validator\Constraints as Assert;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="niveau02")
- * @ORM\HasLifecycleCallbacks()
- *
- * @UniqueEntity(fields="label", message="Un Niveau de rang 2 existe déjà avec ce label")
- */
-class Niveau02
-{
-    /**
-     * @ORM\Column(type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @ORM\Column(type="string", length=250, unique=true)
-     */
-    private $label;
-
-    /**
-     * @ORM\Column(type="string", length=14)
-     */
-    private $siret;
-
-    /**
-     * @ORM\Column(type="text", nullable=true)
-     */
-    private $postaladress;
-        
-    /**
-     * @ORM\ManyToOne(targetEntity="Niveau01", inversedBy="niveau02s")
-     * @ORM\JoinColumn(nullable=false)
-     */
-    private $niveau01;
-    
-    /**
-     * @var ArrayCollection $registrations
-     * @var Registration
-     *
-     * @ORM\OneToMany(targetEntity="Registration", mappedBy="niveau02", cascade={"persist"}, orphanRemoval=false)
-     */
-    private $registrations;
-
-     /**
-     * @var ArrayCollection $users
-     * @var User
-     *
-     * @ORM\OneToMany(targetEntity="User", mappedBy="niveau02", cascade={"persist"}, orphanRemoval=false)
-     */
-    private $users;
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->registrations = new \Doctrine\Common\Collections\ArrayCollection();
-        $this->users = new \Doctrine\Common\Collections\ArrayCollection();
-    }
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set label
-     *
-     * @param string $label
-     *
-     * @return Niveau02
-     */
-    public function setLabel($label)
-    {
-        $this->label = $label;
-
-        return $this;
-    }
-
-    /**
-     * Get label
-     *
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->label;
-    }
-
-    /**
-     * Set siret
-     *
-     * @param string $siret
-     *
-     * @return Niveau02
-     */
-    public function setSiret($siret)
-    {
-        $this->siret = $siret;
-
-        return $this;
-    }
-
-    /**
-     * Get siret
-     *
-     * @return string
-     */
-    public function getSiret()
-    {
-        return $this->siret;
-    }
-
-    /**
-     * Set postaladress
-     *
-     * @param string $postaladress
-     *
-     * @return Niveau02
-     */
-    public function setPostaladress($postaladress)
-    {
-        $this->postaladress = $postaladress;
-
-        return $this;
-    }
-
-    /**
-     * Get postaladress
-     *
-     * @return string
-     */
-    public function getPostaladress()
-    {
-        return $this->postaladress;
-    }
-
-    /**
-     * Set niveau01
-     *
-     * @param \Cadoles\CoreBundle\Entity\Niveau01 $niveau01
-     *
-     * @return Niveau02
-     */
-    public function setNiveau01(\Cadoles\CoreBundle\Entity\Niveau01 $niveau01)
-    {
-        $this->niveau01 = $niveau01;
-
-        return $this;
-    }
-
-    /**
-     * Get niveau01
-     *
-     * @return \Cadoles\CoreBundle\Entity\Niveau01
-     */
-    public function getNiveau01()
-    {
-        return $this->niveau01;
-    }
-
-    /**
-     * Add registration
-     *
-     * @param \Cadoles\CoreBundle\Entity\Registration $registration
-     *
-     * @return Niveau02
-     */
-    public function addRegistration(\Cadoles\CoreBundle\Entity\Registration $registration)
-    {
-        $this->registrations[] = $registration;
-
-        return $this;
-    }
-
-    /**
-     * Remove registration
-     *
-     * @param \Cadoles\CoreBundle\Entity\Registration $registration
-     */
-    public function removeRegistration(\Cadoles\CoreBundle\Entity\Registration $registration)
-    {
-        $this->registrations->removeElement($registration);
-    }
-
-    /**
-     * Get registrations
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getRegistrations()
-    {
-        return $this->registrations;
-    }
-
-    /**
-     * Add user
-     *
-     * @param \Cadoles\CoreBundle\Entity\User $user
-     *
-     * @return Niveau02
-     */
-    public function addUser(\Cadoles\CoreBundle\Entity\User $user)
-    {
-        $this->users[] = $user;
-
-        return $this;
-    }
-
-    /**
-     * Remove user
-     *
-     * @param \Cadoles\CoreBundle\Entity\User $user
-     */
-    public function removeUser(\Cadoles\CoreBundle\Entity\User $user)
-    {
-        $this->users->removeElement($user);
-    }
-
-    /**
-     * Get users
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getUsers()
-    {
-        return $this->users;
-    }
-}
diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Registration.php~ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Registration.php~
deleted file mode 100644
index 4f04d636..00000000
--- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Registration.php~
+++ /dev/null
@@ -1,712 +0,0 @@
-<?php
-namespace Cadoles\CoreBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\ArrayCollection;
-
-use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Validator\Constraints as Assert;
-use Cadoles\CoreBundle\Validator\Password;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="registration")
- * @ORM\HasLifecycleCallbacks()
- *
- * @UniqueEntity(fields="username", message="Un utilisateur existe déjà avec ce login.")
- * @UniqueEntity(fields="email", message="Un utilisateur existe déjà avec ce mail.")
- */
-class Registration implements UserInterface, \Serializable
-{
-    /**
-     * @ORM\Column(type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @ORM\Column(type="string", length=25, unique=true)
-     * @Assert\Length(
-     *      min = "5",
-     *      max = "25",
-     *      minMessage = "Votre nom doit faire au moins {{ limit }} caractères",
-     *      maxMessage = "Votre nom ne peut pas être plus long que {{ limit }} caractères"
-     * )
-     */
-    private $username;
-
-    /**
-     * @ORM\Column(type="string", length=250, nullable=true)
-     */
-    private $firstname;
-
-    /**
-     * @ORM\Column(type="string", length=250, nullable=true)
-     */
-    private $lastname;
-
-    /**
-     * @ORM\Column(type="string", length=250)
-     */
-    private $password;
-
-    /**
-     * @ORM\Column(type="string", length=250)
-     */
-    private $salt;
-
-    /**
-     * @ORM\Column(type="string", length=60, unique=true)
-     */
-    private $email;
-
-    /**
-     * @ORM\Column(name="visible", type="boolean")
-     */
-    protected $visible;
-
-    /**
-     * @ORM\Column(type="datetime", nullable=true)
-     */
-    private $keyexpire;    
-
-    /**
-     * @ORM\Column(type="string", length=60, nullable=true)
-     */
-    private $keyvalue;    
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Statut")
-     * @ORM\JoinColumn(nullable=false)
-     */
-    private $statut;
-
-    /**
-     * @ORM\Column(type="string", length=60, nullable=true)
-     */
-    private $usualname;
-
-    /**
-     * @ORM\Column(type="string", length=60, nullable=true)
-     */
-    private $telephonenumber;
-
-    /**
-     * @ORM\Column(type="string", length=250, nullable=true)
-     */
-    private $postaladress;
-
-    /**
-     * @ORM\Column(type="string", length=250, nullable=true)
-     */
-    private $givensname;
-
-    /**
-     * @ORM\Column(type="date", nullable=true)
-     */
-    private $birthdate;
-
-    /**
-     * @ORM\Column(type="string", length=20, nullable=true)
-     */
-    private $gender;
-
-    /**
-     * @ORM\Column(type="string", length=250, nullable=true)
-     */
-    private $job;
-    
-    /**
-     * @ORM\Column(type="string", length=250, nullable=true)
-     */
-    private $position;    
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Country", inversedBy="registrations")
-     * @ORM\JoinColumn(nullable=true)
-     * @ORM\OrderBy({"label" = "ASC"})
-     */
-    private $birthcountry;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="City", inversedBy="registrations")
-     * @ORM\JoinColumn(nullable=true)
-     */
-    private $birthplace;    
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Niveau01", inversedBy="registrations")
-     * @ORM\JoinColumn(nullable=false)
-     */
-    private $niveau01;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Niveau02", inversedBy="registrations")
-     * @ORM\JoinColumn(nullable=true)
-     */
-    private $niveau02;    
-
-
-
-//== CODE A NE PAS REGENERER
-     
-    public function getUserName()
-    {
-        return $this->username;
-    }
-
-    public function getSalt()
-    {
-        return $this->salt;
-    }
-
-    public function setPassword($password)
-    {
-        if($password!=$this->password&&$password!=""){
-            $this->tempopassword=$password;
-            
-            mt_srand((double)microtime()*1000000);
-            $this->salt = pack("CCCC", mt_rand(), mt_rand(), mt_rand(), mt_rand());
-            $hash = "{SSHA}" . base64_encode(pack("H*", sha1($password . $this->salt)) . $this->salt);
-
-            $this->password = $hash;
-        }
-        
-        return $this;
-    }
-
-    public function getPassword()
-    {
-        return $this->password;
-    }  
-
-    public function getRoles()
-    {
-    }
-
-    public function eraseCredentials()
-    {
-    }
-    
-    /** @see \Serializable::serialize() */
-    public function serialize()
-    {
-        return serialize(array(
-            $this->id,
-            $this->username,
-            $this->password,
-            $this->salt,
-        ));
-    }
-
-    /** @see \Serializable::unserialize() */
-    public function unserialize($serialized)
-    {
-        list (
-            $this->id,
-            $this->login,
-            $this->password,
-            $this->salt
-        ) = unserialize($serialized);
-    }
-
-
-//== FIN DU CODE A NE PAS REGENERER  
-
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set username
-     *
-     * @param string $username
-     *
-     * @return Registration
-     */
-    public function setUsername($username)
-    {
-        $this->username = $username;
-
-        return $this;
-    }
-
-    /**
-     * Set firstname
-     *
-     * @param string $firstname
-     *
-     * @return Registration
-     */
-    public function setFirstname($firstname)
-    {
-        $this->firstname = $firstname;
-
-        return $this;
-    }
-
-    /**
-     * Get firstname
-     *
-     * @return string
-     */
-    public function getFirstname()
-    {
-        return $this->firstname;
-    }
-
-    /**
-     * Set lastname
-     *
-     * @param string $lastname
-     *
-     * @return Registration
-     */
-    public function setLastname($lastname)
-    {
-        $this->lastname = $lastname;
-
-        return $this;
-    }
-
-    /**
-     * Get lastname
-     *
-     * @return string
-     */
-    public function getLastname()
-    {
-        return $this->lastname;
-    }
-
-    /**
-     * Set salt
-     *
-     * @param string $salt
-     *
-     * @return Registration
-     */
-    public function setSalt($salt)
-    {
-        $this->salt = $salt;
-
-        return $this;
-    }
-
-    /**
-     * Set email
-     *
-     * @param string $email
-     *
-     * @return Registration
-     */
-    public function setEmail($email)
-    {
-        $this->email = $email;
-
-        return $this;
-    }
-
-    /**
-     * Get email
-     *
-     * @return string
-     */
-    public function getEmail()
-    {
-        return $this->email;
-    }
-
-    /**
-     * Set visible
-     *
-     * @param boolean $visible
-     *
-     * @return Registration
-     */
-    public function setVisible($visible)
-    {
-        $this->visible = $visible;
-
-        return $this;
-    }
-
-    /**
-     * Get visible
-     *
-     * @return boolean
-     */
-    public function getVisible()
-    {
-        return $this->visible;
-    }
-
-    /**
-     * Set keyexpire
-     *
-     * @param \DateTime $keyexpire
-     *
-     * @return Registration
-     */
-    public function setKeyexpire($keyexpire)
-    {
-        $this->keyexpire = $keyexpire;
-
-        return $this;
-    }
-
-    /**
-     * Get keyexpire
-     *
-     * @return \DateTime
-     */
-    public function getKeyexpire()
-    {
-        return $this->keyexpire;
-    }
-
-    /**
-     * Set keyvalue
-     *
-     * @param string $keyvalue
-     *
-     * @return Registration
-     */
-    public function setKeyvalue($keyvalue)
-    {
-        $this->keyvalue = $keyvalue;
-
-        return $this;
-    }
-
-    /**
-     * Get keyvalue
-     *
-     * @return string
-     */
-    public function getKeyvalue()
-    {
-        return $this->keyvalue;
-    }
-
-    /**
-     * Set usualname
-     *
-     * @param string $usualname
-     *
-     * @return Registration
-     */
-    public function setUsualname($usualname)
-    {
-        $this->usualname = $usualname;
-
-        return $this;
-    }
-
-    /**
-     * Get usualname
-     *
-     * @return string
-     */
-    public function getUsualname()
-    {
-        return $this->usualname;
-    }
-
-    /**
-     * Set telephonenumber
-     *
-     * @param string $telephonenumber
-     *
-     * @return Registration
-     */
-    public function setTelephonenumber($telephonenumber)
-    {
-        $this->telephonenumber = $telephonenumber;
-
-        return $this;
-    }
-
-    /**
-     * Get telephonenumber
-     *
-     * @return string
-     */
-    public function getTelephonenumber()
-    {
-        return $this->telephonenumber;
-    }
-
-    /**
-     * Set postaladress
-     *
-     * @param string $postaladress
-     *
-     * @return Registration
-     */
-    public function setPostaladress($postaladress)
-    {
-        $this->postaladress = $postaladress;
-
-        return $this;
-    }
-
-    /**
-     * Get postaladress
-     *
-     * @return string
-     */
-    public function getPostaladress()
-    {
-        return $this->postaladress;
-    }
-
-    /**
-     * Set givensname
-     *
-     * @param string $givensname
-     *
-     * @return Registration
-     */
-    public function setGivensname($givensname)
-    {
-        $this->givensname = $givensname;
-
-        return $this;
-    }
-
-    /**
-     * Get givensname
-     *
-     * @return string
-     */
-    public function getGivensname()
-    {
-        return $this->givensname;
-    }
-
-    /**
-     * Set birthdate
-     *
-     * @param \DateTime $birthdate
-     *
-     * @return Registration
-     */
-    public function setBirthdate($birthdate)
-    {
-        $this->birthdate = $birthdate;
-
-        return $this;
-    }
-
-    /**
-     * Get birthdate
-     *
-     * @return \DateTime
-     */
-    public function getBirthdate()
-    {
-        return $this->birthdate;
-    }
-
-    /**
-     * Set gender
-     *
-     * @param string $gender
-     *
-     * @return Registration
-     */
-    public function setGender($gender)
-    {
-        $this->gender = $gender;
-
-        return $this;
-    }
-
-    /**
-     * Get gender
-     *
-     * @return string
-     */
-    public function getGender()
-    {
-        return $this->gender;
-    }
-
-    /**
-     * Set job
-     *
-     * @param string $job
-     *
-     * @return Registration
-     */
-    public function setJob($job)
-    {
-        $this->job = $job;
-
-        return $this;
-    }
-
-    /**
-     * Get job
-     *
-     * @return string
-     */
-    public function getJob()
-    {
-        return $this->job;
-    }
-
-    /**
-     * Set position
-     *
-     * @param string $position
-     *
-     * @return Registration
-     */
-    public function setPosition($position)
-    {
-        $this->position = $position;
-
-        return $this;
-    }
-
-    /**
-     * Get position
-     *
-     * @return string
-     */
-    public function getPosition()
-    {
-        return $this->position;
-    }
-
-    /**
-     * Set statut
-     *
-     * @param \Cadoles\CoreBundle\Entity\Statut $statut
-     *
-     * @return Registration
-     */
-    public function setStatut(\Cadoles\CoreBundle\Entity\Statut $statut)
-    {
-        $this->statut = $statut;
-
-        return $this;
-    }
-
-    /**
-     * Get statut
-     *
-     * @return \Cadoles\CoreBundle\Entity\Statut
-     */
-    public function getStatut()
-    {
-        return $this->statut;
-    }
-
-    /**
-     * Set birthcountry
-     *
-     * @param \Cadoles\CoreBundle\Entity\Country $birthcountry
-     *
-     * @return Registration
-     */
-    public function setBirthcountry(\Cadoles\CoreBundle\Entity\Country $birthcountry = null)
-    {
-        $this->birthcountry = $birthcountry;
-
-        return $this;
-    }
-
-    /**
-     * Get birthcountry
-     *
-     * @return \Cadoles\CoreBundle\Entity\Country
-     */
-    public function getBirthcountry()
-    {
-        return $this->birthcountry;
-    }
-
-    /**
-     * Set birthplace
-     *
-     * @param \Cadoles\CoreBundle\Entity\City $birthplace
-     *
-     * @return Registration
-     */
-    public function setBirthplace(\Cadoles\CoreBundle\Entity\City $birthplace = null)
-    {
-        $this->birthplace = $birthplace;
-
-        return $this;
-    }
-
-    /**
-     * Get birthplace
-     *
-     * @return \Cadoles\CoreBundle\Entity\City
-     */
-    public function getBirthplace()
-    {
-        return $this->birthplace;
-    }
-
-    /**
-     * Set niveau01
-     *
-     * @param \Cadoles\CoreBundle\Entity\Niveau01 $niveau01
-     *
-     * @return Registration
-     */
-    public function setNiveau01(\Cadoles\CoreBundle\Entity\Niveau01 $niveau01)
-    {
-        $this->niveau01 = $niveau01;
-
-        return $this;
-    }
-
-    /**
-     * Get niveau01
-     *
-     * @return \Cadoles\CoreBundle\Entity\Niveau01
-     */
-    public function getNiveau01()
-    {
-        return $this->niveau01;
-    }
-
-    /**
-     * Set niveau02
-     *
-     * @param \Cadoles\CoreBundle\Entity\Niveau02 $niveau02
-     *
-     * @return Registration
-     */
-    public function setNiveau02(\Cadoles\CoreBundle\Entity\Niveau02 $niveau02 = null)
-    {
-        $this->niveau02 = $niveau02;
-
-        return $this;
-    }
-
-    /**
-     * Get niveau02
-     *
-     * @return \Cadoles\CoreBundle\Entity\Niveau02
-     */
-    public function getNiveau02()
-    {
-        return $this->niveau02;
-    }
-}
diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Sidebar.php~ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Sidebar.php~
deleted file mode 100644
index de2c406f..00000000
--- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Sidebar.php~
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-namespace Cadoles\CoreBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\ArrayCollection;
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Validator\Constraints as Assert;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="sidebar")
- * @ORM\HasLifecycleCallbacks()
- *
- */
-class Sidebar
-{
-    /**
-     * @ORM\Column(type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @ORM\Column(type="integer")
-     */
-    private $roworder;
-
-    /**
-     * @ORM\Column(type="string", length=250)
-     */
-    private $label;
-
-    /**
-     * @ORM\Column(type="string", length=250, nullable=true)
-     */
-    private $path;
-
-    /**
-     * @ORM\Column(type="string", length=250, nullable=true)
-     */
-    private $fonticon;
-
-    /**
-     * @ORM\Column(type="simple_array", length=250, nullable=true)
-     */
-    private $permission;
-
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Sidebar", inversedBy="childs")
-     * @ORM\JoinColumn(nullable=true)
-     */
-    private $parent;    
-
-    /**
-     * @var ArrayCollection $childs
-     * @var Child
-     *
-     * @ORM\OneToMany(targetEntity="Sidebar", mappedBy="parent", cascade={"persist"}, orphanRemoval=false)
-     * @ORM\OrderBy({"roworder" = "ASC"})
-     */
-    private $childs;       
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->childs = new \Doctrine\Common\Collections\ArrayCollection();
-    }
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set roworder
-     *
-     * @param integer $roworder
-     *
-     * @return Sidebar
-     */
-    public function setRoworder($roworder)
-    {
-        $this->roworder = $roworder;
-
-        return $this;
-    }
-
-    /**
-     * Get roworder
-     *
-     * @return integer
-     */
-    public function getRoworder()
-    {
-        return $this->roworder;
-    }
-
-    /**
-     * Set label
-     *
-     * @param string $label
-     *
-     * @return Sidebar
-     */
-    public function setLabel($label)
-    {
-        $this->label = $label;
-
-        return $this;
-    }
-
-    /**
-     * Get label
-     *
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->label;
-    }
-
-    /**
-     * Set path
-     *
-     * @param string $path
-     *
-     * @return Sidebar
-     */
-    public function setPath($path)
-    {
-        $this->path = $path;
-
-        return $this;
-    }
-
-    /**
-     * Get path
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * Set fonticon
-     *
-     * @param string $fonticon
-     *
-     * @return Sidebar
-     */
-    public function setFonticon($fonticon)
-    {
-        $this->fonticon = $fonticon;
-
-        return $this;
-    }
-
-    /**
-     * Get fonticon
-     *
-     * @return string
-     */
-    public function getFonticon()
-    {
-        return $this->fonticon;
-    }
-
-    /**
-     * Set permission
-     *
-     * @param array $permission
-     *
-     * @return Sidebar
-     */
-    public function setPermission($permission)
-    {
-        $this->permission = $permission;
-
-        return $this;
-    }
-
-    /**
-     * Get permission
-     *
-     * @return array
-     */
-    public function getPermission()
-    {
-        return $this->permission;
-    }
-
-    /**
-     * Set parent
-     *
-     * @param \Cadoles\CoreBundle\Entity\Sidebar $parent
-     *
-     * @return Sidebar
-     */
-    public function setParent(\Cadoles\CoreBundle\Entity\Sidebar $parent = null)
-    {
-        $this->parent = $parent;
-
-        return $this;
-    }
-
-    /**
-     * Get parent
-     *
-     * @return \Cadoles\CoreBundle\Entity\Sidebar
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * Add child
-     *
-     * @param \Cadoles\CoreBundle\Entity\Sidebar $child
-     *
-     * @return Sidebar
-     */
-    public function addChild(\Cadoles\CoreBundle\Entity\Sidebar $child)
-    {
-        $this->childs[] = $child;
-
-        return $this;
-    }
-
-    /**
-     * Remove child
-     *
-     * @param \Cadoles\CoreBundle\Entity\Sidebar $child
-     */
-    public function removeChild(\Cadoles\CoreBundle\Entity\Sidebar $child)
-    {
-        $this->childs->removeElement($child);
-    }
-
-    /**
-     * Get childs
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getChilds()
-    {
-        return $this->childs;
-    }
-}
diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Statut.php~ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Statut.php~
deleted file mode 100644
index bdccda46..00000000
--- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Statut.php~
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-namespace Cadoles\CoreBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\ArrayCollection;
-
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Validator\Constraints as Assert;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="statut")
- * @ORM\HasLifecycleCallbacks()
- *
- * @UniqueEntity(fields="label", message="Un statut existe déjà avec ce label")
- */
-class Statut
-{
-    /**
-     * @ORM\Column(type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @ORM\Column(type="string", length=250, unique=true)
-     */
-    private $label;
-
-    /**
-     * @var ArrayCollection $registrations
-     * @var Registration
-     *
-     * @ORM\OneToMany(targetEntity="Registration", mappedBy="statut", cascade={"persist", "remove"}, orphanRemoval=true)
-     */
-    private $registrations;
-
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->registrations = new \Doctrine\Common\Collections\ArrayCollection();
-    }
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set label
-     *
-     * @param string $label
-     *
-     * @return Statut
-     */
-    public function setLabel($label)
-    {
-        $this->label = $label;
-
-        return $this;
-    }
-
-    /**
-     * Get label
-     *
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->label;
-    }
-
-    /**
-     * Add registration
-     *
-     * @param \Cadoles\CoreBundle\Entity\Registration $registration
-     *
-     * @return Statut
-     */
-    public function addRegistration(\Cadoles\CoreBundle\Entity\Registration $registration)
-    {
-        $this->registrations[] = $registration;
-
-        return $this;
-    }
-
-    /**
-     * Remove registration
-     *
-     * @param \Cadoles\CoreBundle\Entity\Registration $registration
-     */
-    public function removeRegistration(\Cadoles\CoreBundle\Entity\Registration $registration)
-    {
-        $this->registrations->removeElement($registration);
-    }
-
-    /**
-     * Get registrations
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getRegistrations()
-    {
-        return $this->registrations;
-    }
-}
diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/User.php~ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/User.php~
deleted file mode 100644
index dec78c92..00000000
--- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/User.php~
+++ /dev/null
@@ -1,959 +0,0 @@
-<?php
-namespace Cadoles\CoreBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\ArrayCollection;
-
-use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Validator\Constraints as Assert;
-use Cadoles\CoreBundle\Validator\Password;
-
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="user")
- * @ORM\HasLifecycleCallbacks()
- *
- * @UniqueEntity(fields="username", message="Un utilisateur existe déjà avec ce login.")
- * @UniqueEntity(fields="email", message="Un utilisateur existe déjà avec ce mail.")
- */
-class User implements UserInterface, \Serializable
-{
-    /**
-     * @ORM\Column(type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @ORM\Column(type="string", length=50, unique=true)
-     */
-    private $username;
-
-    /**
-     * @ORM\Column(type="string", length=250, nullable=true)
-     */
-    private $firstname;
-
-    /**
-     * @ORM\Column(type="string", length=250, nullable=true)
-     */
-    private $lastname;
-
-    /**
-     * @ORM\Column(type="string", length=250)
-     */
-    private $password;
-
-    /**
-     * @ORM\Column(type="string", length=250)
-     */
-    private $salt;
-
-    /**
-     * @Password()
-     */
-    private $tempopassword;
-
-    /**
-     * @ORM\Column(type="string", length=60, unique=true)
-     */
-    private $email;
-
-    /**
-     * @ORM\Column(name="visible", type="boolean")
-     */
-    protected $visible;
-
-    /**
-      * @ORM\Column(type="string", length=60, nullable=true, options={"default" : 0})
-     */
-    private $avatar;
-
-    /**
-     * @ORM\Column(type="string", length=60)
-     */
-    private $role;
-
-    /**
-     * @ORM\Column(type="string", length=60)
-     */
-    private $authlevel;
-
-    /**
-     * @ORM\Column(type="string", length=9)
-     */
-    private $siren;
-
-    /**
-     * @ORM\Column(type="string", length=14, nullable=true)
-     */
-    private $siret;
-
-    /**
-     * @ORM\Column(type="string", length=60, nullable=true)
-     */
-    private $usualname;
-
-    /**
-     * @ORM\Column(type="string", length=60, nullable=true)
-     */
-    private $telephonenumber;
-
-    /**
-     * @ORM\Column(type="text", nullable=true)
-     */
-    private $postaladress;
-
-    /**
-     * @ORM\Column(type="string", length=250, nullable=true)
-     */
-    private $givensname;
-
-    /**
-     * @ORM\Column(type="date", nullable=true)
-     */
-    private $birthdate;
-
-    /**
-     * @ORM\Column(type="string", length=20, nullable=true)
-     */
-    private $gender;
-
-    /**
-     * @ORM\Column(type="string", length=250, nullable=true)
-     */
-    private $job;
-    
-    /**
-     * @ORM\Column(type="string", length=250, nullable=true)
-     */
-    private $position;    
-
-    /**
-     * @ORM\Column(type="datetime", nullable=true)
-     */
-    private $keyexpire;    
-
-    /**
-     * @ORM\Column(type="string", length=60, nullable=true)
-     */
-    private $keyvalue;    
-        
-    /**
-     * @ORM\Column(type="string", length=250, nullable=true)
-     */
-    private $belongingpopulation;    
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Country", inversedBy="users")
-     * @ORM\JoinColumn(nullable=true)
-     */
-    private $birthcountry;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="City", inversedBy="users")
-     * @ORM\JoinColumn(nullable=true)
-     */
-    private $birthplace;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Niveau01", inversedBy="users")
-     * @ORM\JoinColumn(nullable=false)
-     */
-    private $niveau01;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Niveau02", inversedBy="users")
-     * @ORM\JoinColumn(nullable=true)
-     */
-    private $niveau02;    
-
-    /**
-     * @var ArrayCollection $groups
-     * @var UserGroup
-     *
-     * @ORM\OneToMany(targetEntity="UserGroup", mappedBy="user", cascade={"persist"}, orphanRemoval=true)
-     */
-    private $groups;
-
-    /**
-     * @var ArrayCollection $groups
-     * @var UserGroup
-     *
-     * @ORM\OneToMany(targetEntity="UserModo", mappedBy="user", cascade={"persist"}, orphanRemoval=true)
-     */
-    private $modos;
-
-
-//== CODE A NE PAS REGENERER
-    /**
-     * @ORM\PostLoad
-     */
-    public function PostLoad() {
-        if($this->getAvatar()=="") {
-            $this->setAvatar("noavatar.png");
-        }
-    }
-
-    public function __construct()
-    {
-        $this->profils = new ArrayCollection();
-    }
-
-    public function getUserName()
-    {
-        return $this->username;
-    }
-
-    public function getSalt()
-    {
-        return $this->salt;
-    }
-
-    public function setPassword($password)
-    {
-        if($password!=$this->password&&$password!=""){
-            $this->tempopassword=$password;
-            
-            mt_srand((double)microtime()*1000000);
-            $this->salt = pack("CCCC", mt_rand(), mt_rand(), mt_rand(), mt_rand());
-            $hash = "{SSHA}" . base64_encode(pack("H*", sha1($password . $this->salt)) . $this->salt);
-
-            $this->password = $hash;
-        }
-        
-        return $this;
-    }
-
-    public function setPasswordDirect($password)
-    {
-        $this->password = $password;
-        
-        return $this;
-    }
-        
-    public function getPassword()
-    {
-        return $this->password;
-    }
-
-    public function getRoles()
-    {
-        return explode(",",$this->role);
-    }
-
-    public function eraseCredentials()
-    {
-    }
-
-    /** @see \Serializable::serialize() */
-    public function serialize()
-    {
-        return serialize(array(
-            $this->id,
-            $this->username,
-            $this->password,
-            $this->salt,
-        ));
-    }
-
-    /** @see \Serializable::unserialize() */
-    public function unserialize($serialized)
-    {
-        list (
-            $this->id,
-            $this->login,
-            $this->password,
-            $this->salt
-        ) = unserialize($serialized);
-    }
-
-//== FIN DU CODE A NE PAS REGENERER
-
-
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set username
-     *
-     * @param string $username
-     *
-     * @return User
-     */
-    public function setUsername($username)
-    {
-        $this->username = $username;
-
-        return $this;
-    }
-
-    /**
-     * Set firstname
-     *
-     * @param string $firstname
-     *
-     * @return User
-     */
-    public function setFirstname($firstname)
-    {
-        $this->firstname = $firstname;
-
-        return $this;
-    }
-
-    /**
-     * Get firstname
-     *
-     * @return string
-     */
-    public function getFirstname()
-    {
-        return $this->firstname;
-    }
-
-    /**
-     * Set lastname
-     *
-     * @param string $lastname
-     *
-     * @return User
-     */
-    public function setLastname($lastname)
-    {
-        $this->lastname = $lastname;
-
-        return $this;
-    }
-
-    /**
-     * Get lastname
-     *
-     * @return string
-     */
-    public function getLastname()
-    {
-        return $this->lastname;
-    }
-
-    /**
-     * Set salt
-     *
-     * @param string $salt
-     *
-     * @return User
-     */
-    public function setSalt($salt)
-    {
-        $this->salt = $salt;
-
-        return $this;
-    }
-
-    /**
-     * Set email
-     *
-     * @param string $email
-     *
-     * @return User
-     */
-    public function setEmail($email)
-    {
-        $this->email = $email;
-
-        return $this;
-    }
-
-    /**
-     * Get email
-     *
-     * @return string
-     */
-    public function getEmail()
-    {
-        return $this->email;
-    }
-
-    /**
-     * Set visible
-     *
-     * @param boolean $visible
-     *
-     * @return User
-     */
-    public function setVisible($visible)
-    {
-        $this->visible = $visible;
-
-        return $this;
-    }
-
-    /**
-     * Get visible
-     *
-     * @return boolean
-     */
-    public function getVisible()
-    {
-        return $this->visible;
-    }
-
-    /**
-     * Set avatar
-     *
-     * @param string $avatar
-     *
-     * @return User
-     */
-    public function setAvatar($avatar)
-    {
-        $this->avatar = $avatar;
-
-        return $this;
-    }
-
-    /**
-     * Get avatar
-     *
-     * @return string
-     */
-    public function getAvatar()
-    {
-        return $this->avatar;
-    }
-
-    /**
-     * Set role
-     *
-     * @param string $role
-     *
-     * @return User
-     */
-    public function setRole($role)
-    {
-        $this->role = $role;
-
-        return $this;
-    }
-
-    /**
-     * Get role
-     *
-     * @return string
-     */
-    public function getRole()
-    {
-        return $this->role;
-    }
-
-    /**
-     * Set authlevel
-     *
-     * @param string $authlevel
-     *
-     * @return User
-     */
-    public function setAuthlevel($authlevel)
-    {
-        $this->authlevel = $authlevel;
-
-        return $this;
-    }
-
-    /**
-     * Get authlevel
-     *
-     * @return string
-     */
-    public function getAuthlevel()
-    {
-        return $this->authlevel;
-    }
-
-    /**
-     * Set siren
-     *
-     * @param string $siren
-     *
-     * @return User
-     */
-    public function setSiren($siren)
-    {
-        $this->siren = $siren;
-
-        return $this;
-    }
-
-    /**
-     * Get siren
-     *
-     * @return string
-     */
-    public function getSiren()
-    {
-        return $this->siren;
-    }
-
-    /**
-     * Set siret
-     *
-     * @param string $siret
-     *
-     * @return User
-     */
-    public function setSiret($siret)
-    {
-        $this->siret = $siret;
-
-        return $this;
-    }
-
-    /**
-     * Get siret
-     *
-     * @return string
-     */
-    public function getSiret()
-    {
-        return $this->siret;
-    }
-
-    /**
-     * Set usualname
-     *
-     * @param string $usualname
-     *
-     * @return User
-     */
-    public function setUsualname($usualname)
-    {
-        $this->usualname = $usualname;
-
-        return $this;
-    }
-
-    /**
-     * Get usualname
-     *
-     * @return string
-     */
-    public function getUsualname()
-    {
-        return $this->usualname;
-    }
-
-    /**
-     * Set telephonenumber
-     *
-     * @param string $telephonenumber
-     *
-     * @return User
-     */
-    public function setTelephonenumber($telephonenumber)
-    {
-        $this->telephonenumber = $telephonenumber;
-
-        return $this;
-    }
-
-    /**
-     * Get telephonenumber
-     *
-     * @return string
-     */
-    public function getTelephonenumber()
-    {
-        return $this->telephonenumber;
-    }
-
-    /**
-     * Set postaladress
-     *
-     * @param string $postaladress
-     *
-     * @return User
-     */
-    public function setPostaladress($postaladress)
-    {
-        $this->postaladress = $postaladress;
-
-        return $this;
-    }
-
-    /**
-     * Get postaladress
-     *
-     * @return string
-     */
-    public function getPostaladress()
-    {
-        return $this->postaladress;
-    }
-
-    /**
-     * Set givensname
-     *
-     * @param string $givensname
-     *
-     * @return User
-     */
-    public function setGivensname($givensname)
-    {
-        $this->givensname = $givensname;
-
-        return $this;
-    }
-
-    /**
-     * Get givensname
-     *
-     * @return string
-     */
-    public function getGivensname()
-    {
-        return $this->givensname;
-    }
-
-    /**
-     * Set birthdate
-     *
-     * @param \DateTime $birthdate
-     *
-     * @return User
-     */
-    public function setBirthdate($birthdate)
-    {
-        $this->birthdate = $birthdate;
-
-        return $this;
-    }
-
-    /**
-     * Get birthdate
-     *
-     * @return \DateTime
-     */
-    public function getBirthdate()
-    {
-        return $this->birthdate;
-    }
-
-    /**
-     * Set gender
-     *
-     * @param string $gender
-     *
-     * @return User
-     */
-    public function setGender($gender)
-    {
-        $this->gender = $gender;
-
-        return $this;
-    }
-
-    /**
-     * Get gender
-     *
-     * @return string
-     */
-    public function getGender()
-    {
-        return $this->gender;
-    }
-
-    /**
-     * Set job
-     *
-     * @param string $job
-     *
-     * @return User
-     */
-    public function setJob($job)
-    {
-        $this->job = $job;
-
-        return $this;
-    }
-
-    /**
-     * Get job
-     *
-     * @return string
-     */
-    public function getJob()
-    {
-        return $this->job;
-    }
-
-    /**
-     * Set position
-     *
-     * @param string $position
-     *
-     * @return User
-     */
-    public function setPosition($position)
-    {
-        $this->position = $position;
-
-        return $this;
-    }
-
-    /**
-     * Get position
-     *
-     * @return string
-     */
-    public function getPosition()
-    {
-        return $this->position;
-    }
-
-    /**
-     * Set belongingpopulation
-     *
-     * @param string $belongingpopulation
-     *
-     * @return User
-     */
-    public function setBelongingpopulation($belongingpopulation)
-    {
-        $this->belongingpopulation = $belongingpopulation;
-
-        return $this;
-    }
-
-    /**
-     * Get belongingpopulation
-     *
-     * @return string
-     */
-    public function getBelongingpopulation()
-    {
-        return $this->belongingpopulation;
-    }
-
-    /**
-     * Set birthcountry
-     *
-     * @param \Cadoles\CoreBundle\Entity\Country $birthcountry
-     *
-     * @return User
-     */
-    public function setBirthcountry(\Cadoles\CoreBundle\Entity\Country $birthcountry = null)
-    {
-        $this->birthcountry = $birthcountry;
-
-        return $this;
-    }
-
-    /**
-     * Get birthcountry
-     *
-     * @return \Cadoles\CoreBundle\Entity\Country
-     */
-    public function getBirthcountry()
-    {
-        return $this->birthcountry;
-    }
-
-    /**
-     * Set birthplace
-     *
-     * @param \Cadoles\CoreBundle\Entity\City $birthplace
-     *
-     * @return User
-     */
-    public function setBirthplace(\Cadoles\CoreBundle\Entity\City $birthplace = null)
-    {
-        $this->birthplace = $birthplace;
-
-        return $this;
-    }
-
-    /**
-     * Get birthplace
-     *
-     * @return \Cadoles\CoreBundle\Entity\City
-     */
-    public function getBirthplace()
-    {
-        return $this->birthplace;
-    }
-
-    /**
-     * Set niveau01
-     *
-     * @param \Cadoles\CoreBundle\Entity\Niveau01 $niveau01
-     *
-     * @return User
-     */
-    public function setNiveau01(\Cadoles\CoreBundle\Entity\Niveau01 $niveau01)
-    {
-        $this->niveau01 = $niveau01;
-
-        return $this;
-    }
-
-    /**
-     * Get niveau01
-     *
-     * @return \Cadoles\CoreBundle\Entity\Niveau01
-     */
-    public function getNiveau01()
-    {
-        return $this->niveau01;
-    }
-
-    /**
-     * Set niveau02
-     *
-     * @param \Cadoles\CoreBundle\Entity\Niveau02 $niveau02
-     *
-     * @return User
-     */
-    public function setNiveau02(\Cadoles\CoreBundle\Entity\Niveau02 $niveau02 = null)
-    {
-        $this->niveau02 = $niveau02;
-
-        return $this;
-    }
-
-    /**
-     * Get niveau02
-     *
-     * @return \Cadoles\CoreBundle\Entity\Niveau02
-     */
-    public function getNiveau02()
-    {
-        return $this->niveau02;
-    }
-
-    /**
-     * Add group
-     *
-     * @param \Cadoles\CoreBundle\Entity\UserGroup $group
-     *
-     * @return User
-     */
-    public function addGroup(\Cadoles\CoreBundle\Entity\UserGroup $group)
-    {
-        $this->groups[] = $group;
-
-        return $this;
-    }
-
-    /**
-     * Remove group
-     *
-     * @param \Cadoles\CoreBundle\Entity\UserGroup $group
-     */
-    public function removeGroup(\Cadoles\CoreBundle\Entity\UserGroup $group)
-    {
-        $this->groups->removeElement($group);
-    }
-
-    /**
-     * Get groups
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getGroups()
-    {
-        return $this->groups;
-    }
-
-    /**
-     * Add modo
-     *
-     * @param \Cadoles\CoreBundle\Entity\UserModo $modo
-     *
-     * @return User
-     */
-    public function addModo(\Cadoles\CoreBundle\Entity\UserModo $modo)
-    {
-        $this->modos[] = $modo;
-
-        return $this;
-    }
-
-    /**
-     * Remove modo
-     *
-     * @param \Cadoles\CoreBundle\Entity\UserModo $modo
-     */
-    public function removeModo(\Cadoles\CoreBundle\Entity\UserModo $modo)
-    {
-        $this->modos->removeElement($modo);
-    }
-
-    /**
-     * Get modos
-     *
-     * @return \Doctrine\Common\Collections\Collection
-     */
-    public function getModos()
-    {
-        return $this->modos;
-    }
-
-    /**
-     * Set keyexpire
-     *
-     * @param \DateTime $keyexpire
-     *
-     * @return User
-     */
-    public function setKeyexpire($keyexpire)
-    {
-        $this->keyexpire = $keyexpire;
-
-        return $this;
-    }
-
-    /**
-     * Get keyexpire
-     *
-     * @return \DateTime
-     */
-    public function getKeyexpire()
-    {
-        return $this->keyexpire;
-    }
-
-    /**
-     * Set keyvalue
-     *
-     * @param string $keyvalue
-     *
-     * @return User
-     */
-    public function setKeyvalue($keyvalue)
-    {
-        $this->keyvalue = $keyvalue;
-
-        return $this;
-    }
-
-    /**
-     * Get keyvalue
-     *
-     * @return string
-     */
-    public function getKeyvalue()
-    {
-        return $this->keyvalue;
-    }
-}
diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/UserGroup.php~ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/UserGroup.php~
deleted file mode 100644
index 05b17238..00000000
--- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/UserGroup.php~
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-namespace Cadoles\CoreBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\ArrayCollection;
-
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Validator\Constraints as Assert;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="usergroupe")
- * @ORM\HasLifecycleCallbacks()
- *
- * @UniqueEntity(fields={"user", "group"}, message="Cette liaison existe déjà !")
- */
-class UserGroup
-{
-    /**
-     * @ORM\Column(type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="User", inversedBy="groups")
-     * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false)
-     */
-    private $user;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Group", inversedBy="users")
-     * @ORM\JoinColumn(name="group_id", referencedColumnName="id", nullable=false)
-     */
-    private $group;
-
-  
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set user
-     *
-     * @param \Cadoles\CoreBundle\Entity\User $user
-     *
-     * @return UserGroup
-     */
-    public function setUser(\Cadoles\CoreBundle\Entity\User $user)
-    {
-        $this->user = $user;
-
-        return $this;
-    }
-
-    /**
-     * Get user
-     *
-     * @return \Cadoles\CoreBundle\Entity\User
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
-
-    /**
-     * Set group
-     *
-     * @param \Cadoles\CoreBundle\Entity\Group $group
-     *
-     * @return UserGroup
-     */
-    public function setGroup(\Cadoles\CoreBundle\Entity\Group $group)
-    {
-        $this->group = $group;
-
-        return $this;
-    }
-
-    /**
-     * Get group
-     *
-     * @return \Cadoles\CoreBundle\Entity\Group
-     */
-    public function getGroup()
-    {
-        return $this->group;
-    }
-}
diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/UserModo.php~ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/UserModo.php~
deleted file mode 100644
index 662666d8..00000000
--- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/UserModo.php~
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-namespace Cadoles\CoreBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\ArrayCollection;
-
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Validator\Constraints as Assert;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="usermodo")
- * @ORM\HasLifecycleCallbacks()
- *
- * @UniqueEntity(fields={"user", "service"}, message="Cette liaison existe déjà !")
- */
-class UserModo
-{
-    /**
-     * @ORM\Column(type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="User", inversedBy="modos")
-     * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false)
-     */
-    private $user;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Niveau01", inversedBy="modos")
-     * @ORM\JoinColumn(name="niveau01_id", referencedColumnName="id", nullable=false)
-     */
-    private $niveau01;
-  
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set user
-     *
-     * @param \Cadoles\CoreBundle\Entity\User $user
-     *
-     * @return UserModo
-     */
-    public function setUser(\Cadoles\CoreBundle\Entity\User $user)
-    {
-        $this->user = $user;
-
-        return $this;
-    }
-
-    /**
-     * Get user
-     *
-     * @return \Cadoles\CoreBundle\Entity\User
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
-
-    /**
-     * Set niveau01
-     *
-     * @param \Cadoles\CoreBundle\Entity\Niveau01 $niveau01
-     *
-     * @return UserModo
-     */
-    public function setNiveau01(\Cadoles\CoreBundle\Entity\Niveau01 $niveau01)
-    {
-        $this->niveau01 = $niveau01;
-
-        return $this;
-    }
-
-    /**
-     * Get niveau01
-     *
-     * @return \Cadoles\CoreBundle\Entity\Niveau01
-     */
-    public function getNiveau01()
-    {
-        return $this->niveau01;
-    }
-}
diff --git a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Whitelist.php~ b/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Whitelist.php~
deleted file mode 100644
index 5087849f..00000000
--- a/src/cadolesuser-1.0/src/Cadoles/CoreBundle/Entity/Whitelist.php~
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-namespace Cadoles\CoreBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\ArrayCollection;
-
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Validator\Constraints as Assert;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="whitelist")
- * @ORM\HasLifecycleCallbacks()
- *
- * @UniqueEntity(fields="label", message="Une liste blanche existe déjà avec ce label")
- */
-class Whitelist
-{
-    /**
-     * @ORM\Column(type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
-
-    /**
-     * @ORM\Column(type="string", length=250, unique=true)
-     */
-    private $label;
-
-
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set label
-     *
-     * @param string $label
-     *
-     * @return Whitelist
-     */
-    public function setLabel($label)
-    {
-        $this->label = $label;
-
-        return $this;
-    }
-
-    /**
-     * Get label
-     *
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->label;
-    }
-}