Merge branch 'upgrade-sf3' into add_email_and_phone_to_person

Entity/Person.php

@@ -60,6 +60,7 @@ class Person implements HasCenterInterface {
 
     const MALE_GENDER = 'man';
     const FEMALE_GENDER = 'woman';
+    const BOTH_GENDER = 'both';
 
     /** @var \Chill\PersonBundle\Entity\MaritalStatus The marital status of the person */
     private $maritalStatus;
@@ -778,11 +779,11 @@ class Person implements HasCenterInterface {
     public function isAddressesValid(ExecutionContextInterface $context)
     {
         if ($this->hasTwoAdressWithSameValidFromDate()) {
-            $context->addViolationAt(
-                'addresses',
-                'Two addresses has the same validFrom date',
-                array()
-            );
+            $context
+                ->buildViolation('Two addresses has the same validFrom date')
+                ->atPath('addresses')
+                ->addViolation()
+                ;
         }
     }