User/Person models merge

app/views/admin/conference/_recent_registrations.html.haml

@@ -11,9 +11,9 @@
           %tbody
             %tr
               %td #{index + 1}
-              %td #{registration.public_name}
+              %td #{registration.name}
               %td #{registration.conference.title}
               %td #{registration.created_at.strftime('%m/%d/%Y')}
 - else
   %h5.text-warning.text-center
-    No registrations!
+    No registrations!

app/views/admin/conference/_recent_submissions.html.haml

@@ -12,11 +12,11 @@
           %tbody
             %tr
               %td #{index + 1}
-              %td #{event.submitter}
+              %td #{event.submitter.name}
               %td #{event.title}
               %td #{event.conference.title}
               %td
                 .span{'class'=>label_for(event.state)} #{event.state.humanize}
 - else
   %h5.text-warning.text-center
-    No submissions!
+    No submissions!

app/views/admin/conference/_recent_users.html.haml

@@ -20,4 +20,4 @@
                 %span.label.label-danger Unconfirmed
 - else
   %h5.text-warning.text-center
-    No sign ups!
+    No sign ups!

app/views/admin/conference/_top_submitter.html.haml

@@ -6,10 +6,10 @@
       - @top_submitter.each do |key, value|
         .row.top-submitter
           .col-md-2
-            = image_tag(key.gravatar_url(size: '25'), title: "Yo #{key.public_name}!", :alt => '', 'class'=>'img-circle img-responsive text-center')
+            = image_tag(key.gravatar_url(size: '25'), title: "Yo #{key.name}!", :alt => '', 'class'=>'img-circle img-responsive text-center')
           .col-md-10
             %h4
-              #{key}
+              #{key.name}
               %div
                 %small
                   #{pluralize(value, 'submission')}