Merge remote-tracking branch 'origin/timeline' into upgrade/rails-5

Conflicts:
	app/views/gardens/show.html.haml
	spec/controllers/photo_associations_controller_spec.rb

app/models/csv_importer.rb

@@ -64,7 +64,7 @@ class CsvImporter
   def cropbot
     @cropbot = Member.find_by!(login_name: 'cropbot') unless @cropbot
     @cropbot
-  rescue
+  rescue StandardError
     raise "cropbot account not found: run rake db:seed"
   end
 end

db/seeds.rb

@@ -65,7 +65,7 @@ def load_test_users # rubocop:disable Metrics/AbcSize
   source_path = Rails.root.join('db', 'seeds')
   begin
     suburb_file = File.open("#{source_path}/suburbs.csv")
-  rescue
+  rescue StandardError
     puts "Warning: unable to open suburbs.csv"
   end