Applied changes caused by the security fix in spree 1.2.4.

Conflicts:
	app/controllers/admin/base_controller_decorator.rb
fix mailer

Conflicts:
	app/mailers/spree/order_mailer_decorator.rb
	app/mailers/spree/shipment_mailer_decorator.rb
fix : order mailer

Conflicts:
	app/mailers/spree/order_mailer_decorator.rb