Merge branch 'FX-alan-admin-deleteuser-500' into alan_develop

app/models/user.rb

@@ -116,7 +116,7 @@ class User < Principal
   has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
   has_one :rss_token, :class_name => 'Token', :conditions => "action='feeds'"
   has_one :blog,  :class_name => 'Blog', :foreign_key => "author_id"
-  has_many :org_document_comments, :dependent =>:destroy
+  has_many :org_document_comments, :dependent =>:destroy, :foreign_key => "creator_id"
   has_one :api_token, :class_name => 'Token', :conditions => "action='api'"
   belongs_to :auth_source
   has_many :org_members