added crop photos and a new placeholder image
Fixed RSS bug where comments were showing up as "edited"

Tried many ways to test this (assert_select, response.has_tag, etc), but
couldn't get it to work.  Have tested manually and it looks good.
Delete photo from photos/show page
Merge pull request #218 from Skud/crop-photos

added crop photos and a new placeholder image
Merge branch 'dev' into delete_photos

Conflicts:
	spec/models/planting_spec.rb
Merge pull request #217 from Skud/rss-bug

Fixed RSS bug where comments were showing up as "edited"
Merge pull request #219 from pozorvlak/delete_photos

Delete photos
minor tweakage to admin/order/search
Merge branch 'dev' into payments-new