action mailer - might work
Merge branch 'master' into actionmailer

Conflicts:
	app/controllers/orders_controller.rb