Backend on Bootstrap

Conflicts:
	backend/app/assets/stylesheets/spree/backend/components/_date-picker.scss
	backend/app/assets/stylesheets/spree/backend/components/_navigation.scss
	backend/app/assets/stylesheets/spree/backend/globals/_variables.scss
	backend/app/assets/stylesheets/spree/backend/plugins/_jstree.scss
	backend/app/assets/stylesheets/spree/backend/sections/_orders.scss
	backend/app/assets/stylesheets/spree/backend/sections/_products.scss
	backend/app/assets/stylesheets/spree/backend/shared/_icons.scss
	backend/app/assets/stylesheets/spree/backend/shared/_tables.scss
	backend/app/assets/stylesheets/spree/backend/shared/_typography.scss
	backend/app/assets/stylesheets/spree/backend/spree_admin.scss
	backend/app/controllers/spree/admin/general_settings_controller.rb
	backend/app/helpers/spree/admin/adjustments_helper.rb
	backend/app/views/spree/admin/customer_returns/_return_item_decision.html.erb
	backend/app/views/spree/admin/general_settings/edit.html.erb
	backend/app/views/spree/admin/images/_form.html.erb
	backend/app/views/spree/admin/inventory_units/adjust.html.erb
	backend/app/views/spree/admin/orders/_adjustments.html.erb
	backend/app/views/spree/admin/orders/_line_items.html.erb
	backend/app/views/spree/admin/orders/_line_items_edit_form.html.erb
	backend/app/views/spree/admin/orders/_shipment.html.erb
	backend/app/views/spree/admin/orders/_shipment_manifest.html.erb
	backend/app/views/spree/admin/orders/customer_details/_form.html.erb
	backend/app/views/spree/admin/orders/edit.html.erb
	backend/app/views/spree/admin/orders/index.html.erb
	backend/app/views/spree/admin/payment_methods/_form.html.erb
	backend/app/views/spree/admin/payments/_form.html.erb
	backend/app/views/spree/admin/payments/_list.html.erb
	backend/app/views/spree/admin/products/_form.html.erb
	backend/app/views/spree/admin/products/new.html.erb
	backend/app/views/spree/admin/products/stock.html.erb
	backend/app/views/spree/admin/promotion_categories/edit.html.erb
	backend/app/views/spree/admin/promotion_categories/index.html.erb
	backend/app/views/spree/admin/promotion_categories/new.html.erb
	backend/app/views/spree/admin/promotion_rules/create.js.erb
	backend/app/views/spree/admin/promotions/_actions.html.erb
	backend/app/views/spree/admin/promotions/actions/_create_line_items.html.erb
	backend/app/views/spree/admin/promotions/edit.html.erb
	backend/app/views/spree/admin/promotions/index.html.erb
	backend/app/views/spree/admin/promotions/new.html.erb
	backend/app/views/spree/admin/promotions/rules/_item_total.html.erb
	backend/app/views/spree/admin/promotions/rules/_taxon.html.erb
	backend/app/views/spree/admin/properties/index.html.erb
	backend/app/views/spree/admin/prototypes/_form.html.erb
	backend/app/views/spree/admin/prototypes/_prototypes.html.erb
	backend/app/views/spree/admin/return_authorizations/_form.html.erb
	backend/app/views/spree/admin/shared/_address.html.erb
	backend/app/views/spree/admin/shared/_configuration_menu.html.erb
	backend/app/views/spree/admin/shared/_order_summary.html.erb
	backend/app/views/spree/admin/shared/_product_tabs.html.erb
	backend/app/views/spree/admin/shared/_promotion_sub_menu.html.erb
	backend/app/views/spree/admin/shared/_report_order_criteria.html.erb
	backend/app/views/spree/admin/shared/_tabs.html.erb
	backend/app/views/spree/admin/shipping_categories/_form.html.erb
	backend/app/views/spree/admin/shipping_methods/_form.html.erb
	backend/app/views/spree/admin/stock_locations/_form.html.erb
	backend/app/views/spree/admin/stock_movements/_form.html.erb
	backend/app/views/spree/admin/stock_transfers/new.html.erb
	backend/app/views/spree/admin/tax_categories/_form.html.erb
	backend/app/views/spree/admin/tax_categories/index.html.erb
	backend/app/views/spree/admin/taxonomies/new.html.erb
	backend/app/views/spree/admin/taxons/index.html.erb
	backend/app/views/spree/admin/trackers/_form.html.erb
	backend/app/views/spree/admin/users/_form.html.erb
	backend/app/views/spree/admin/users/index.html.erb
	backend/app/views/spree/admin/variants/_split.js.erb
	backend/app/views/spree/admin/variants/index.html.erb
	backend/app/views/spree/admin/variants/new.js.erb
	backend/app/views/spree/admin/zones/_form.html.erb
	backend/spec/controllers/spree/admin/general_settings_controller_spec.rb
	backend/spec/features/admin/configuration/stock_locations_spec.rb
	backend/spec/features/admin/products/properties_spec.rb
	backend/spec/features/admin/products/prototypes_spec.rb
	backend/spec/features/admin/stock_transfer_spec.rb
	core/app/models/spree/adjustment.rb
	core/app/models/spree/order.rb
	core/app/models/spree/promotion/rules/taxon.rb
	core/app/models/spree/shipment.rb
	core/config/locales/en.yml
	core/spec/models/spree/promotion/rules/taxon_spec.rb
	core/spec/models/spree/stock/packer_spec.rb
	core/spree_core.gemspec
	guides/content/developer/deployment/deployment_tips.markdown
	guides/content/developer/deployment/heroku.md