Use Spree 2.2.0.beta
Bump to active_shipping 0.11.0

Fixes #136

Conflicts:
	spree_active_shipping.gemspec
rate calculations per package not by order
added some helper functions as well to cleanup some of the code
also made sure the weight tests where using packages instead
of orders and that they still made sense

Conflicts:
	spec/models/weight_limits_spec.rb
Merge pull request #140 from mrpollo/calculate_rates_per_package_master

rate calculations per package not by order
Don't re-draw admin/product routes
delete, icon, translation fix
Updated routes.rb to use :add_routes for 2.1

Fixes #149
Version 2.2.0
Redid the product packages admin interface. Brought it up to the new admin standard from 1.3.

The new and edit commands function like the images new command.

Wasn't a clean merge because of the Spree 2.0 translations

Signed-off-by: Nathan Lowrie <nate@finelineautomation.com>

Conflicts:
	app/controllers/spree/admin/product_packages_controller.rb
	app/models/spree/product_decorator.rb
	app/views/spree/admin/product_packages/index.html.erb
	config/locales/en.yml
Updated the settings pages to the new UI standard introduced in Spree 1.3.

Merge wasn't clean again due to spree translations.

Signed-off-by: Nathan Lowrie <nate@finelineautomation.com>

Conflicts:
	app/overrides/add_active_shipping_settings_tab.rb
	app/views/spree/admin/active_shipping_settings/edit.html.erb
	app/views/spree/admin/active_shipping_settings/show.html.erb
	config/locales/en.yml
Added an icon to the product packages tab entry.

I think the truck fits better than a barcode.

Signed-off-by: Nathan Lowrie <nate@finelineautomation.com>

Conflicts:
	app/overrides/add_packages_tab.rb
Gave the readme a long need updated.

Signed-off-by: Nathan Lowrie <nate@finelineautomation.com>

Conflicts:
	README.md
remove pry require from the specs

Fixes #145
Fixed test to not reference the show route for the settings page.

Signed-off-by: Nathan Lowrie <nate@finelineautomation.com>

Fixes #154
Added USPS First Class Package International Service
Merge pull request #156 from dpritchett/master

Added USPS First Class Package International Service Calculator
max weight for country only returns oz - refactored max_weight_for_country - changed some services available method to max_weight_for_country, this will avoid getting zero results back to the estimator because available? in super now checks the api response - removed hard coded * 16 from hell

Conflicts:
	app/models/spree/calculator/shipping/usps/first_class_mail_international.rb
	app/models/spree/calculator/shipping/usps/first_class_mail_international_large_envelope.rb
	app/models/spree/calculator/shipping/usps/first_class_mail_parcels.rb

Conflicts:
	app/models/spree/calculator/shipping/usps/first_class_mail_international.rb
	app/models/spree/calculator/shipping/usps/first_class_mail_international_large_envelope.rb
Clarify weights and carrier rates - Added comments on what units are expected back from Spree - Example on converting units from kb to oz - Clarify how the carrier rates are obtained and cached
first check if a package is shippable this happens before calling the carrier - Make sure the available? overrides inside each service don't raise exceptions
changed weight limits from lb to oz on usps calcs this extension works with oz and this services where long using lbs erroneously