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
Better styling for import button.
Merge branch 'master' of https://github.com/tryshoppe/core

Conflicts:
	Gemfile.lock
	app/controllers/shoppe/products_controller.rb
	app/views/shoppe/products/index.html.haml
	shoppe.gemspec
Merge branch 'tryshoppe-master' into develop
Add new Gemfile.lock.
Reference the correct localization titles for session views.
Fix page titles.exit
extend active model callbacks
Localized imports.
Add Polish and Portuguese translations (may need work).
Add example format to product import view.
add permalink validations to products and product categories
add index on permalink columns
solves issue #81
Merge pull request #3 from tryshoppe/master

Update from base
Fix product importing.  Add more localizations.