Update to new Spree 1.3 namespace changes.

Conflicts:
	app/controllers/spree/wishlists_controller.rb