Allow multiple shipping categories to be set for a shipping method
Rename generate_api_key method in Admin::BaseController because it conflict's with spree_auth_devise's Admin::UsersController method of the same name
Make OrderPopulator error messages translatable

Fixes #2845

Conflicts:
	core/app/models/spree/order_populator.rb