fix error in user loading and validate scope/user consistency

Controller/ActivityController.php

@@ -295,18 +295,19 @@ class ActivityController extends Controller
                     $this->get('translator')
                         ->trans('Success : activity updated!')
                 );
-//die();
+            
             return $this->redirect($this->generateUrl('chill_activity_activity_show', array('id' => $id, 'person_id' => $person_id)));
         }
 
         $this->get('session')
             ->getFlashBag()
-            ->add('danger',
+            ->add('error',
                 $this->get('translator')
-                    ->trans('The form is not valid. The activity has not been updated !')
+                    ->trans('This form contains errors')
             );
 
         return $this->render('ChillActivityBundle:Activity:edit.html.twig', array(
+            'person'      => $entity->getPerson(),
             'entity'      => $entity,
             'edit_form'   => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),