Merge branch 'develop'

Model/User/UserModel.php

@@ -29,17 +29,11 @@ abstract class UserModel extends SovUserModel
      */
     protected $isSaleAlwaysOpen;
 
-
     /**
      * @ORM\ManyToOne(targetEntity="Lc\CaracoleBundle\Model\Merchant\MerchantInterface")
      */
     protected $favoriteMerchant;
 
-    /**
-     * @ORM\Column(type="datetime", nullable=true)
-     */
-    protected $lastLogin;
-
     /**
      * @ORM\OneToMany(targetEntity="Lc\CaracoleBundle\Model\Address\AddressInterface", mappedBy="user", cascade={"persist"})
      */
@@ -124,19 +118,6 @@ abstract class UserModel extends SovUserModel
         return $this;
     }
 
-    public function getLastLogin()
-    {
-        return $this->lastLogin;
-    }
-
-    public function setLastLogin(\DateTime $time = null)
-    {
-        $this->lastLogin = $time;
-
-        return $this;
-    }
-
-
     /**
      * @return Collection|AddressInterface[]
      */