Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface

app/models/contract.rb

@@ -2,7 +2,7 @@ class Contract < ActiveRecord::Base
   belongs_to :user
   attr_accessible :user_id, :first_name, :last_name, :signed_at, :document, :document_file_name, :document_content_type, :document_file_size, :document_updated_at
 
-  validates_presence_of :first_name, :last_name, :signed_at
+  validates_presence_of :first_name, :signed_at #, :last_name
 
   has_attached_file :document, { :styles => { :medium => "300x300>"},
                     :storage => :s3,

app/views/contracts/index.html.erb

@@ -13,7 +13,7 @@
     <th></th>
   </tr>
 
-  <% @contracts.sort_by{|r| [r.last_name] }.each do |contract| %>
+  <% @contracts.sort_by{|r| (r.last_name) || "" }.each do |contract| %>
     <tr>
       <td>
         <% unless contract.document.blank? %>