Merge branch 'master' of github.com:diaspora/diaspora_rails

app/models/collection.rb

@@ -4,7 +4,7 @@ class Collection
   key :name, String
 
   belongs_to :person, :class_name => 'Person'
-  many :photos, :class_name => 'Photo', :foreign_key => :collection_id
+  #many :photos, :class_name => 'Photo', :foreign_key => :collection_id
 
   validates_presence_of :name
 

app/models/photo.rb

@@ -2,8 +2,4 @@ class Photo < Post
   require 'carrierwave/orm/mongomapper'
   include MongoMapper::Document
   mount_uploader :image, ImageUploader
-
-  key :collection_id, ObjectId
-
-  belongs_to :collection, :class_name => 'Collection'
 end