tidy up boolean ordering
Improve internationalisation support
Fix little typos
Add pt-BR translations
Merge pull request #1 from coresdamartucha/i18n_support

Fix little typos
fix order_item quantity error translation
add polish translation
fix translations with html tags
add i18n support to status_tag helper
add translation to product categories edit view
add missing translation to pl.yml
update Gemfile.lock
Switch to bcrypt gem (from bcrypt-ruby).
Remove dependency on bcrypt-ruby.
Add ability to import products.
Update gemfile.lock.
Updat.e
Delete rvmrc
Merge pull request #1 from naked-apps/feature/add_product_importing

Feature/add product importing
Merge remote-tracking branch 'refs/remotes/upstream/master' into i18n_support

Conflicts:
	app/controllers/shoppe/attachments_controller.rb
	app/controllers/shoppe/countries_controller.rb
	app/controllers/shoppe/delivery_service_prices_controller.rb
	app/controllers/shoppe/delivery_services_controller.rb
	app/controllers/shoppe/payments_controller.rb
	app/controllers/shoppe/product_categories_controller.rb
	app/controllers/shoppe/products_controller.rb
	app/controllers/shoppe/sessions_controller.rb
	app/controllers/shoppe/settings_controller.rb
	app/controllers/shoppe/tax_rates_controller.rb
	app/controllers/shoppe/users_controller.rb
	app/controllers/shoppe/variants_controller.rb
	app/helpers/shoppe/application_helper.rb
	app/views/layouts/shoppe/application.html.haml
	app/views/shoppe/countries/_form.html.haml
	app/views/shoppe/countries/edit.html.haml
	app/views/shoppe/countries/index.html.haml
	app/views/shoppe/countries/new.html.haml
	app/views/shoppe/delivery_service_prices/_form.html.haml
	app/views/shoppe/delivery_service_prices/edit.html.haml
	app/views/shoppe/delivery_service_prices/index.html.haml
	app/views/shoppe/delivery_service_prices/new.html.haml
	app/views/shoppe/delivery_services/_form.html.haml
	app/views/shoppe/delivery_services/edit.html.haml
	app/views/shoppe/delivery_services/index.html.haml
	app/views/shoppe/delivery_services/new.html.haml
	app/views/shoppe/orders/_form.html.haml
	app/views/shoppe/orders/_status_bar.html.haml
	app/views/shoppe/orders/despatch_note.html.haml
	app/views/shoppe/orders/index.html.haml
	app/views/shoppe/orders/new.html.haml
	app/views/shoppe/payments/refund.html.haml
	app/views/shoppe/product_categories/_form.html.haml
	app/views/shoppe/product_categories/edit.html.haml
	app/views/shoppe/product_categories/index.html.haml
	app/views/shoppe/product_categories/new.html.haml
	app/views/shoppe/products/_form.html.haml
	app/views/shoppe/products/_table.html.haml
	app/views/shoppe/products/edit.html.haml
	app/views/shoppe/products/index.html.haml
	app/views/shoppe/products/new.html.haml
	app/views/shoppe/sessions/new.html.haml
	app/views/shoppe/sessions/reset.html.haml
	app/views/shoppe/settings/edit.html.haml
	app/views/shoppe/shared/error.html.haml
	app/views/shoppe/stock_level_adjustments/index.html.haml
	app/views/shoppe/tax_rates/form.html.haml
	app/views/shoppe/tax_rates/index.html.haml
	app/views/shoppe/users/_form.html.haml
	app/views/shoppe/users/edit.html.haml
	app/views/shoppe/users/index.html.haml
	app/views/shoppe/users/new.html.haml
	app/views/shoppe/variants/form.html.haml
	app/views/shoppe/variants/index.html.haml
	config/locales/en.yml