Fix current_currency conflict with spree_multi_currency.

Conflicts:
	Gemfile