Fixing gemfile
Fixing initializers for spree_print_invoices and spree_social_products
Fixing initializers for spree_print_invoices and spree_social_products
Merge branch 'master' of github.com:Siesna/sfi into Siesna-master

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/spree/print_invoice_configuration.rb
	config/initializers/spree.rb