belongs_to_image working as it did before

Conflicts:
	spec/internal/db/schema.rb
RC1