Delete photo from photos/show page
Merge branch 'dev' into delete_photos

Conflicts:
	spec/models/planting_spec.rb
Merge pull request #219 from pozorvlak/delete_photos

Delete photos