Create 2-1-stable branch and lock it to 2-1-stable of spree
Fix digital calculator and add a splitter to put digital items in their own 'shipment'.
Update specs.
Modified DigitalDelivery so it inherits from Spree::ShippingCalculator. Fixes #48
Fix calculator.
Added s3 support. Fixes #1

Removed strong params

Added basic test coverage of s3 in digitals_controller

Conflicts:
	app/controllers/spree/admin/digitals_controller.rb
	app/controllers/spree/admin/orders_controller_decorator.rb
	app/controllers/spree/digitals_controller.rb
	app/models/spree/digital.rb
	spec/controllers/digitals_controller_spec.rb
Merge branch 'master_variant' of https://github.com/Grantismo/spree_digital

Conflicts:
	app/views/spree/admin/digitals/_form.html.erb
Fix form syntax.
order#show is now gone in favor of order#edit, fix reset link
merge with halo
update redirect path is spec
add paperclip-dropbox
fix delete translation display
integrate with dropbox-paperclip private mode
add preserve_files preference
basic dropbox browser, show list of files, select one, fill in hidden form fields
better looking file selector
dropbox file selector works for products with variants
generate digital links when order is completed instead of on the save hook
indent