View fixed after rebase according to latest changes.

app/views/people/show.html.haml

@@ -47,7 +47,7 @@
   - else
     .floating
       %h3
-        = t('.not_connected', :name => @person.real_name, :gender => current_user)
+        = t('.not_connected', :name => @person.name, :gender => current_user)
         
       - unless pending_request_for(@person)
         %h3
@@ -59,5 +59,5 @@
       - else
         %h3
           .description
-            = t('.already_requested', :name => @person.real_name, :gender => current_user)
+            = t('.already_requested', :name => @person.name, :gender => current_user)