bump friendly_id version
move admin tabs
Moved Admin Tab deface files
Fixed Deface issues, strong parameters, a few misc problems.  Still need to fix links on the Supplier index view.
removed attr_accessible
2.1 stable.  Added CSS.  Removed DropShip.  Removed protected attributes.  So now need to add StrongParams to API and DropShip.  Here goes...
Move to Strong Parameters.  Changes to Supplier links to get Edit & Delete working.  Added Logo.  Katori_dev database.  Fix for spree_fancy ( variant.in_stock? ).  Filter GET out of log.  Currently at Spree 2.1.3
Strong Parameters
Revert change on Suppliers index page
Cleanup Strong Parameter changes.  Edit link on Suppliers index page still needs to be fixed
remove unnecessary whitespace
Merge branch 'master' of https://github.com/mdundas/spree_drop_ship

Conflicts:
	app/views/spree/admin/suppliers/index.html.erb
Fixes a couple bugs reported in #35