Mailers now require a from address, so we need to give defaults, using MailMethod.current

Conflicts:
	api/spec/controllers/spree/api/v1/shipments_controller_spec.rb
	core/app/models/spree/app_configuration.rb