Merge branch 'master' of https://github.com/nwwatson/entropi_social

Author: Nicholas Watson

app/models/asset_photo.rb

@@ -1,4 +1,5 @@
 class AssetPhoto < ActiveRecord::Base
   belongs_to :photoable, :polymorphic => true
   belongs_to :photo
-end
+end
+

app/models/comment.rb

@@ -5,4 +5,11 @@ class Comment < ActiveRecord::Base
 
   # NOTE: Comments belong to a profile
   belongs_to :profile
+  
+  def as_json(options={})
+    hash = super.as_json
+    # add profile to json
+    hash["profile"] = self.profile
+    return hash    
+  end
 end