Merge remote-tracking branch 'origin/master' into fire-maintenance-role

Conflicts:
	app/models/service_request.rb
	app/views/service_requests/_service_request.json.jbuilder