User/Person models merge

app/views/layouts/_admin_sidebar_index.html.haml

@@ -24,7 +24,3 @@
     = link_to(admin_users_path) do
       %span.glyphicon.glyphicon-user
       Users
-  %li
-    = link_to(admin_people_path) do
-      %span.glyphicon.glyphicon-star-empty
-      People

app/views/layouts/_navigation.html.haml

@@ -16,11 +16,11 @@
         %ul.nav.navbar-nav.navbar-right
           %li.dropdown
             %a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#", id: "current-user-detail"}
-              - if not current_user.person.public_name.empty?
-                #{current_user.person.public_name}
+              - if not current_user.name.empty?
+                #{current_user.name}
               -else
                 #{current_user.email}
-              = image_tag(current_user.person.gravatar_url(size: '18'), title: "Yo #{current_user.person.public_name}!", :alt => '')
+              = image_tag(current_user.gravatar_url(size: '18'), title: "Yo #{current_user.name}!", :alt => '')
               %b.caret
             %ul.dropdown-menu
               = render 'layouts/user_menu'