added crop photos and a new placeholder image
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