Merge branch 'master' into divide

Conflicts:
	app/admin/recipients.rb
	app/controllers/recipients_controller.rb
	app/models/mailing.rb
	app/models/recipient.rb
	config/routes.rb